Improve func FRAME_TRACE DTMF digit format.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380655 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c
index 45da9691a635eba60e135bb5b1f1e979e0cb58bb..6410d12b80211d56e025706abae1bb270e0cc70e 100644 (file)
--- 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 ddc74a183d0a89a9b1102ea153ed95e55c5c5159..a3f67da61bddddaf319357e31514641e05df6df5 100644 (file)
--- 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;
        }
 }