Convert val_to_str -> val_to_str_wmem.

This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions.

val_to_str officially now uses wmem_packet_scope()

Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81
Reviewed-on: https://code.wireshark.org/review/6933
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 16 insertions, 6 deletions

diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index 20e67954cb..7d2ab8d470 100644
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -100,6 +100,7 @@ static void camelsrt_draw(void *phs)
   double x, delay, delay_max, delay_min, delta;
   double criteria[NB_CRITERIA] = { 5.0, 10.0, 75.0, 90.0, 95.0, 99.0, 99.90 };
   double delay_criteria[NB_CRITERIA];
+  gchar* tmp_str;
 
   printf("\n");
   printf("Camel Service Response Time (SRT) Statistics:\n");
@@ -108,8 +109,9 @@ static void camelsrt_draw(void *phs)
   printf("|-------------------------|---------|-----------|-----------|-----------|-----------|-----------|\n");
 
   j = 1;
+  tmp_str = val_to_str_wmem(NULL, j, camelSRTtype_naming, "Unknown Message 0x%02x");
   printf("|%24s |%8u |%8.2f s |%8.2f s |%8.2f s |%10u |%10u |\n",
-         val_to_str(j, camelSRTtype_naming, "Unknown Message 0x%02x"),
+         tmp_str,
          hs->stats[j].num,
          nstime_to_sec(&(hs->stats[j].min)),
          nstime_to_sec(&(hs->stats[j].max)),
@@ -117,16 +119,19 @@ static void camelsrt_draw(void *phs)
          hs->stats[j].min_num,
          hs->stats[j].max_num
          );
+  wmem_free(NULL, tmp_str);
   for (j=2; j<NB_CAMELSRT_CATEGORY; j++) {
     if (hs->stats[j].num == 0) {
+      tmp_str = val_to_str_wmem(NULL, j, camelSRTtype_naming, "Unknown Message 0x%02x");
       printf("|%24s |%8u |%8.2f ms|%8.2f ms|%8.2f ms|%10u |%10u |\n",
-             val_to_str(j, camelSRTtype_naming, "Unknown Message 0x%02x"),
-             0, 0.0, 0.0, 0.0, 0, 0);
+             tmp_str, 0, 0.0, 0.0, 0.0, 0, 0);
+      wmem_free(NULL, tmp_str);
       continue;
     }
 
+    tmp_str = val_to_str_wmem(NULL, j, camelSRTtype_naming, "Unknown Message 0x%02x");
     printf("|%24s |%8u |%8.2f ms|%8.2f ms|%8.2f ms|%10u |%10u |\n",
-           val_to_str(j, camelSRTtype_naming, "Unknown Message 0x%02x"),
+           tmp_str,
            hs->stats[j].num,
            MIN(9999, nstime_to_msec(&(hs->stats[j].min))),
            MIN(9999, nstime_to_msec(&(hs->stats[j].max))),
@@ -134,6 +139,7 @@ static void camelsrt_draw(void *phs)
            hs->stats[j].min_num,
            hs->stats[j].max_num
            );
+    wmem_free(NULL, tmp_str);
   } /* j category */
 
   printf("=================================================================================================\n");
@@ -183,11 +189,15 @@ static void camelsrt_draw(void *phs)
         delay_criteria[z] = delay;
       } /* z criteria */
       /* Append the result to the table */
-      printf("X%24s |", val_to_str(j, camelSRTtype_naming, "Unknown") );
+      tmp_str = val_to_str_wmem(NULL, j, camelSRTtype_naming, "Unknown Message 0x%02x");
+      printf("X%24s |", tmp_str);
+      wmem_free(NULL, tmp_str);
       for (z=0; z<NB_CRITERIA; z++) printf("%8.2f |", MIN(9999, delay_criteria[z]));
       printf("\n");
     } else { /* count */
-      printf("X%24s |", val_to_str(j, camelSRTtype_naming, "Unknown") );
+      tmp_str = val_to_str_wmem(NULL, j, camelSRTtype_naming, "Unknown Message 0x%02x");
+      printf("X%24s |", tmp_str);
+      wmem_free(NULL, tmp_str);
       for (z=0; z<NB_CRITERIA; z++) printf("%8.2f |", 0.0);
       printf("\n");
     } /* count */