diff options
Diffstat (limited to 'epan/value_string.c')
-rw-r--r-- | epan/value_string.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/epan/value_string.c b/epan/value_string.c index 298fd176ed..aac00ba9ec 100644 --- a/epan/value_string.c +++ b/epan/value_string.c @@ -38,15 +38,7 @@ const gchar * val_to_str(const guint32 val, const value_string *vs, const char *fmt) { - const gchar *ret; - - DISSECTOR_ASSERT(fmt != NULL); - - ret = try_val_to_str(val, vs); - if (ret != NULL) - return ret; - - return wmem_strdup_printf(wmem_packet_scope(), fmt, val); + return val_to_str_wmem(wmem_packet_scope(), val, vs, fmt); } gchar * @@ -317,15 +309,7 @@ try_val_to_str_idx_ext(const guint32 val, value_string_ext *vse, gint *idx) const gchar * val_to_str_ext(const guint32 val, value_string_ext *vse, const char *fmt) { - const gchar *ret; - - DISSECTOR_ASSERT(fmt != NULL); - - ret = try_val_to_str_ext(val, vse); - if (ret != NULL) - return ret; - - return wmem_strdup_printf(wmem_packet_scope(), fmt, val); + return val_to_str_ext_wmem(wmem_packet_scope(), val, vse, fmt); } gchar * |