diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-01-31 18:15:49 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-01-31 18:15:49 +0000 |
commit | 32ac38ea37881a9e5387561ea37ba767ba8c2745 (patch) | |
tree | e4975ce18b93dd169a7c5c88eac735d8518c2860 | |
parent | 683726a5e75b3c08544030217aeb6810108378c3 (diff) |
Improve func FRAME_TRACE DTMF digit format.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | funcs/func_frame_trace.c | 6 | ||||
-rw-r--r-- | main/frame.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c index 45da9691a..6410d12b8 100644 --- a/funcs/func_frame_trace.c +++ b/funcs/func_frame_trace.c @@ -209,7 +209,8 @@ static void print_frame(struct ast_frame *frame) switch (frame->frametype) { case AST_FRAME_DTMF_END: ast_verbose("FrameType: DTMF END\n"); - ast_verbose("Digit: %d\n", frame->subclass.integer); + ast_verbose("Digit: 0x%02X '%c'\n", frame->subclass.integer, + frame->subclass.integer < ' ' ? ' ' : frame->subclass.integer); break; case AST_FRAME_VOICE: ast_verbose("FrameType: VOICE\n"); @@ -372,7 +373,8 @@ static void print_frame(struct ast_frame *frame) break; case AST_FRAME_DTMF_BEGIN: ast_verbose("FrameType: DTMF BEGIN\n"); - ast_verbose("Digit: %d\n", frame->subclass.integer); + ast_verbose("Digit: 0x%02X '%c'\n", frame->subclass.integer, + frame->subclass.integer < ' ' ? ' ' : frame->subclass.integer); break; } diff --git a/main/frame.c b/main/frame.c index ddc74a183..a3f67da61 100644 --- a/main/frame.c +++ b/main/frame.c @@ -692,6 +692,7 @@ void ast_frame_subclass2str(struct ast_frame *f, char *subclass, size_t slen, ch break; default: ast_copy_string(subclass, "Unknown Subclass", slen); + break; } } @@ -734,6 +735,7 @@ void ast_frame_type2str(enum ast_frame_type frame_type, char *ftype, size_t len) break; default: snprintf(ftype, len, "Unknown Frametype '%d'", frame_type); + break; } } |