diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-10 14:20:06 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-10 19:58:21 +0000 |
| commit | 14cad60f7d4b60b9974e9f1f79d22d60900e3e6b (patch) | |
| tree | b972f6850290c9fabda18383247019189bb072e7 /epan/conversation_table.c | |
| parent | 59c1e32d2c6dbdd353ae996d9538141bb029d6d0 (diff) | |
Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string.
Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af
Reviewed-on: https://code.wireshark.org/review/6480
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/conversation_table.c')
| -rw-r--r-- | epan/conversation_table.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/conversation_table.c b/epan/conversation_table.c index ad6f5acedc..b857b20e3c 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -432,7 +432,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir switch(direction){ case CONV_DIR_A_TO_FROM_B: /* A <-> B */ - str = ep_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s && %s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_ANY_ADDRESS), src_addr, sport?" && ":"", @@ -449,7 +449,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_A_TO_B: /* A --> B */ - str = ep_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s && %s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_SRC_ADDRESS), src_addr, sport?" && ":"", @@ -466,7 +466,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_A_FROM_B: /* A <-- B */ - str = ep_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s && %s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_DST_ADDRESS), src_addr, sport?" && ":"", @@ -483,7 +483,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_A_TO_FROM_ANY: /* A <-> ANY */ - str = ep_strdup_printf("%s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_ANY_ADDRESS), src_addr, sport?" && ":"", @@ -494,7 +494,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_A_TO_ANY: /* A --> ANY */ - str = ep_strdup_printf("%s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_SRC_ADDRESS), src_addr, sport?" && ":"", @@ -505,7 +505,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_A_FROM_ANY: /* A <-- ANY */ - str = ep_strdup_printf("%s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_DST_ADDRESS), src_addr, sport?" && ":"", @@ -516,7 +516,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_ANY_TO_FROM_B: /* ANY <-> B */ - str = ep_strdup_printf("%s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_ANY_ADDRESS), dst_addr, dport?" && ":"", @@ -527,7 +527,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_ANY_FROM_B: /* ANY <-- B */ - str = ep_strdup_printf("%s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_SRC_ADDRESS), dst_addr, dport?" && ":"", @@ -538,7 +538,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir break; case CONV_DIR_ANY_TO_B: /* ANY --> B */ - str = ep_strdup_printf("%s==%s%s%s%s%s", + str = wmem_strdup_printf(NULL, "%s==%s%s%s%s%s", conversation_get_filter_name(conv_item, CONV_FT_DST_ADDRESS), dst_addr, dport?" && ":"", |