diff options
author | Evan Huus <eapache@gmail.com> | 2013-09-13 16:48:07 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-09-13 16:48:07 +0000 |
commit | cabf9740595b2960f113e8b5708b912fbda88987 (patch) | |
tree | 152ea751a37f52e479dc5e93b563b15193b53ec8 /epan | |
parent | b3ce4ecc1460fc0171d65e69549e155b447d851a (diff) |
Remove useless-use-of-emem, add modelines.
svn path=/trunk/; revision=52005
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-ziop.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index 4d3054ee55..4a2f90155d 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -34,7 +34,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> #include <epan/conversation.h> #include "packet-ziop.h" @@ -242,7 +241,7 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { { guint8 flags; guint byte_order; - emem_strbuf_t *flags_strbuf = ep_strbuf_new_label("none"); + const char *label = "none"; ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, ENC_NA); ziop_tree = proto_item_add_subtree (ti, ett_ziop); @@ -258,10 +257,10 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { byte_order = (flags & 0x01) ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN; if (flags & 0x01) { - ep_strbuf_printf(flags_strbuf, "little-endian"); + label = "little-endian"; } proto_tree_add_uint_format_value(ziop_tree, hf_ziop_flags, tvb, offset, 1, - flags, "0x%02x (%s)", flags, flags_strbuf->str); + flags, "0x%02x (%s)", flags, label); offset++; proto_tree_add_item(ziop_tree, hf_ziop_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -336,3 +335,16 @@ void proto_reg_handoff_ziop (void) { data_handle = find_dissector("data"); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ |