diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-12 15:07:22 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-12 15:07:22 +0000 |
| commit | fe5238e384b5313ef170e7805e1840d9e863bff2 (patch) | |
| tree | c34f23892966d12af4dc01b9c980e739bbe7d5ff /epan/dissectors/packet-t30.c | |
| parent | a10254082be3c82362e8883c1a122942c240b931 (diff) | |
Convert from emem to wmem.
Trivial whitespace fix in packet-tftp.c while at it.
svn path=/trunk/; revision=51970
Diffstat (limited to 'epan/dissectors/packet-t30.c')
| -rw-r--r-- | epan/dissectors/packet-t30.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c index 90a673fe4e..f77558adbe 100644 --- a/epan/dissectors/packet-t30.c +++ b/epan/dissectors/packet-t30.c @@ -31,7 +31,7 @@ #include <string.h> #include <epan/packet.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-t38.h" @@ -492,7 +492,7 @@ t30_get_string_numbers(tvbuff_t *tvb, int offset, int len) if (len != LENGTH_T30_NUM) return NULL; - buf=(gchar *)ep_alloc(LENGTH_T30_NUM+1); + buf=(gchar *)wmem_alloc(wmem_packet_scope(), LENGTH_T30_NUM+1); for (i=0; i<LENGTH_T30_NUM; i++) buf[LENGTH_T30_NUM-i-1] = reverse_byte(tvb_get_guint8(tvb, offset+i)); @@ -612,7 +612,7 @@ dissect_t30_partial_page_request(tvbuff_t *tvb, int offset, packet_info *pinfo, int frame_count = 0; int frame; #define BUF_SIZE (10*1 + 90*2 + 156*3 + 256*2 + 1) /* 0..9 + 10..99 + 100..255 + 256*', ' + \0 */ - gchar *buf = (gchar *)ep_alloc(BUF_SIZE); + gchar *buf = (gchar *)wmem_alloc(wmem_packet_scope(), BUF_SIZE); gchar *buf_top = buf; if (len != 32) { |