aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sita.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-09-14 14:33:04 +0000
committerJörg Mayer <jmayer@loplof.de>2013-09-14 14:33:04 +0000
commitf737cea032a70212c0149cbf5b8c2bcb1be4a8dd (patch)
treeaee17146eca6f7a5bac318f9bac20545059a6132 /epan/dissectors/packet-sita.c
parent7584f77567a8e45c57341b8c4885ef85fbec233d (diff)
emem -> wmem
svn path=/trunk/; revision=52038
Diffstat (limited to 'epan/dissectors/packet-sita.c')
-rw-r--r--epan/dissectors/packet-sita.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c
index c911bb752c..5878c3d06c 100644
--- a/epan/dissectors/packet-sita.c
+++ b/epan/dissectors/packet-sita.c
@@ -35,7 +35,7 @@
#include <epan/packet.h>
#include <wiretap/wtap.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
static dissector_table_t sita_dissector_table;
static dissector_handle_t data_handle;
@@ -75,27 +75,27 @@ static int hf_dcd = -1;
#define IOP "Local"
#define REMOTE "Remote"
-static gchar *
+static const gchar *
format_flags_string(guchar value, const gchar *array[])
{
int i;
guint bpos;
- emem_strbuf_t *buf;
+ wmem_strbuf_t *buf;
const char *sep = "";
- buf = ep_strbuf_sized_new(MAX_FLAGS_LEN, MAX_FLAGS_LEN);
+ buf = wmem_strbuf_sized_new(wmem_packet_scope(), MAX_FLAGS_LEN, MAX_FLAGS_LEN);
for (i = 0; i < 8; i++) {
bpos = 1 << i;
if (value & bpos) {
if (array[i][0]) {
/* there is a string to emit... */
- ep_strbuf_append_printf(buf, "%s%s", sep,
+ wmem_strbuf_append_printf(buf, "%s%s", sep,
array[i]);
sep = ", ";
}
}
}
- return buf->str;
+ return wmem_strbuf_get_str(buf);
}
static void
@@ -103,7 +103,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti;
guchar flags, signals, errors1, errors2, proto;
- gchar *errors1_string, *errors2_string, *signals_string, *flags_string;
+ const gchar *errors1_string, *errors2_string, *signals_string, *flags_string;
proto_tree *sita_tree = NULL;
proto_tree *sita_flags_tree = NULL;
proto_tree *sita_errors1_tree = NULL;