diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 21:36:37 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-15 21:36:37 +0000 |
| commit | da8240ef608746f9f47526c315c0dca8fcc0ab15 (patch) | |
| tree | 874489efe62bd5f22680aadd4df3ad834421975e /epan/dissectors/packet-vxi11.c | |
| parent | da27bad13bfddec18c18a8e95a994b7c676a6f05 (diff) | |
emem -> wmem (except uat or init routines)
svn path=/trunk/; revision=52087
Diffstat (limited to 'epan/dissectors/packet-vxi11.c')
| -rw-r--r-- | epan/dissectors/packet-vxi11.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index 0f9648a5e2..14ddf34938 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/epan/dissectors/packet-vxi11.c @@ -29,7 +29,7 @@ #include "config.h" #include "packet-rpc.h" -#include <epan/emem.h> +#include <epan/wmem/wmem.h> /* * For the protocol specifications, see @@ -243,23 +243,23 @@ dissect_flags(tvbuff_t *tvb, int offset, proto_tree *tree) if (flags != 0) { - emem_strbuf_t *strbuf = ep_strbuf_new_label(NULL); + wmem_strbuf_t *strbuf = wmem_strbuf_new_label(wmem_packet_scope()); if (flags & VXI11_CORE_FLAG_WAITLOCK) { - ep_strbuf_append(strbuf, "WAIT_LOCK, "); + wmem_strbuf_append(strbuf, "WAIT_LOCK, "); } if (flags & VXI11_CORE_FLAG_END) { - ep_strbuf_append(strbuf, "END, "); + wmem_strbuf_append(strbuf, "END, "); } if (flags & VXI11_CORE_FLAG_TERMCHRSET) { - ep_strbuf_append(strbuf, "TERM_CHR_SET, "); + wmem_strbuf_append(strbuf, "TERM_CHR_SET, "); } - ep_strbuf_truncate(strbuf, strbuf->len - 2); - proto_item_append_text(flags_item, " (%s)", strbuf->str); + wmem_strbuf_truncate(strbuf, wmem_strbuf_get_len(strbuf) - 2); + proto_item_append_text(flags_item, " (%s)", wmem_strbuf_get_str(strbuf)); } } } @@ -288,23 +288,23 @@ dissect_reason(tvbuff_t *tvb, int offset, proto_tree *tree) if (reason != 0) { - emem_strbuf_t *strbuf = ep_strbuf_new_label(NULL); + wmem_strbuf_t *strbuf = wmem_strbuf_new_label(wmem_packet_scope()); if (reason & VXI11_CORE_REASON_REQCNT) { - ep_strbuf_append(strbuf, "REQ_CNT, "); + wmem_strbuf_append(strbuf, "REQ_CNT, "); } if (reason & VXI11_CORE_REASON_CHR) { - ep_strbuf_append(strbuf, "CHR, "); + wmem_strbuf_append(strbuf, "CHR, "); } if (reason & VXI11_CORE_REASON_END) { - ep_strbuf_append(strbuf, "END, "); + wmem_strbuf_append(strbuf, "END, "); } - ep_strbuf_truncate(strbuf, strbuf->len - 2); - proto_item_append_text(reason_item, " (%s)", strbuf->str); + wmem_strbuf_truncate(strbuf, wmem_strbuf_get_len(strbuf) - 2); + proto_item_append_text(reason_item, " (%s)", wmem_strbuf_get_str(strbuf)); } } } |