fix some more silly rotating buffers

svn path=/trunk/; revision=15385

2 files changed, 6 insertions, 18 deletions

diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index d9a4b93898..5b5888bb92 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -32,20 +32,14 @@
 #include "packet_info.h"
 #include "pint.h"
 #include "sna-utils.h"
+#include "emem.h"
 
 gchar *
 sna_fid_to_str(const address *addr)
 {
-  static gchar	str[3][14];
-  static gchar	*cur;
+  gchar	*cur;
 
-  if (cur == &str[0][0]) {
-    cur = &str[1][0];
-  } else if (cur == &str[1][0]) {
-    cur = &str[2][0];
-  } else {
-    cur = &str[0][0];
-  }
+  cur=ep_alloc(14);
   sna_fid_to_str_buf(addr, cur);
   return cur;
 }
diff --git a/epan/value_string.c b/epan/value_string.c
index 45daa54184..62dc8d4c80 100644
--- a/epan/value_string.c
+++ b/epan/value_string.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 
 #include "to_str.h"
+#include "emem.h"
 #include "value_string.h"
 
 /* Tries to match val against each element in the value_string array vs.
@@ -37,8 +38,7 @@
 const gchar*
 val_to_str(guint32 val, const value_string *vs, const char *fmt) {
   const gchar *ret;
-  static gchar  str[3][64];
-  static gchar *cur;
+  gchar *cur;
 
   g_assert(fmt != NULL);
 
@@ -46,13 +46,7 @@ val_to_str(guint32 val, const value_string *vs, const char *fmt) {
   if (ret != NULL)
     return ret;
 
-  if (cur == &str[0][0]) {
-    cur = &str[1][0];
-  } else if (cur == &str[1][0]) {
-    cur = &str[2][0];
-  } else {
-    cur = &str[0][0];
-  }
+  cur=ep_alloc(64);
   g_snprintf(cur, 64, fmt, val);
   return cur;
 }