diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 10:13:19 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-13 10:13:19 +0000 |
| commit | 23d3e3d665ce2826477bf04ceabe961330cfcd5a (patch) | |
| tree | 5ba7e0d34e5a234c811a34fdd9e4ba2b52dd1848 /epan/dissectors/packet-pgm.c | |
| parent | 1e762e315dcb07f8d78d7aabc20f5065a8ed43f0 (diff) | |
Dario Lombardo <lomato@gmail.com> via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147
Migration from emem to wmem for trivial cases (ep_alloc only).
svn path=/trunk/; revision=52002
Diffstat (limited to 'epan/dissectors/packet-pgm.c')
| -rw-r--r-- | epan/dissectors/packet-pgm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 99ad81b426..e1f334af50 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -34,7 +34,7 @@ #include <epan/addr_resolv.h> #include <epan/strutil.h> #include <epan/prefs.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/ptvcursor.h> /* @@ -257,7 +257,7 @@ optsstr(guint8 opts) if (opts == 0) return(""); - msg=(char *)ep_alloc(MAX_STR_LEN); + msg=(char *)wmem_alloc(wmem_packet_scope(), MAX_STR_LEN); if (opts & PGM_OPT){ returned_length = g_snprintf(&msg[idx], MAX_STR_LEN-idx, "Present"); idx += MIN(returned_length, MAX_STR_LEN-idx); @@ -289,7 +289,7 @@ paritystr(guint8 parity) if (parity == 0) return(""); - msg=(char *)ep_alloc(MAX_STR_LEN); + msg=(char *)wmem_alloc(wmem_packet_scope(), MAX_STR_LEN); if (parity & PGM_OPT_PARITY_PRM_PRO){ returned_length = g_snprintf(&msg[idx], MAX_STR_LEN-idx, "Pro-active"); idx += MIN(returned_length, MAX_STR_LEN-idx); @@ -506,7 +506,7 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) firsttime = TRUE; soffset = 0; naks = (int)(optdata_len/sizeof(guint32)); - nakbuf = (unsigned char *)ep_alloc(8192); + nakbuf = (unsigned char *)wmem_alloc(wmem_packet_scope(), 8192); j = 0; /* * Print out 8 per line |