diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-02 19:58:29 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-03 13:03:32 +0000 |
| commit | b63599762468e4cf1783419a5556377604d344bb (patch) | |
| tree | f77790ecea3d83e6552dcd68420ab5035d8adede /ui/cli/tap-rtp.c | |
| parent | e9429732ff91cbbbaead63b643870da91ef415bd (diff) | |
| download | wireshark-b63599762468e4cf1783419a5556377604d344bb.tar.gz wireshark-b63599762468e4cf1783419a5556377604d344bb.tar.bz2 wireshark-b63599762468e4cf1783419a5556377604d344bb.zip | |
Convert val_to_str_ext -> val_to_str_ext_wmem for calls that don't have valid packet scope (GUI).
val_to_str_ext now officially uses wmem_packet_scope().
Removed const from val_to_str[_ext]_wmem return value since it's not really constant.
Created utility functions in qt_ui_utils.h to help with the new memory management for its GUI.
Change-Id: Idf2ce4a4ce78d628b2269ad23a3a48fbfc9c077c
Reviewed-on: https://code.wireshark.org/review/6926
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/cli/tap-rtp.c')
| -rw-r--r-- | ui/cli/tap-rtp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index 135750f523..878d4368c9 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -84,14 +84,13 @@ rtp_streams_stat_draw(void *arg _U_) /* payload type */ if (strinfo->payload_type > 95) { if (strinfo->payload_type_name != NULL) { - payload_type = g_strdup(strinfo->payload_type_name); + payload_type = wmem_strdup(NULL, strinfo->payload_type_name); }else{ - payload_type = g_strdup_printf("Unknown(%u)", strinfo->payload_type); + payload_type = wmem_strdup_printf(NULL, "Unknown(%u)", strinfo->payload_type); } }else{ - payload_type = g_strdup(val_to_str_ext(strinfo->payload_type, &rtp_payload_type_vals_ext, - "Unknown (%u)")); + payload_type = val_to_str_ext_wmem(NULL, strinfo->payload_type, &rtp_payload_type_vals_ext, "Unknown (%u)"); } /* packet count, lost packets */ @@ -125,6 +124,7 @@ rtp_streams_stat_draw(void *arg _U_) g_free(payload_type); wmem_free(NULL, src_addr); wmem_free(NULL, dst_addr); + wmem_free(NULL, payload_type); } printf("==============================================================\n"); |