diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-08-10 22:55:02 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-08-10 22:55:02 +0000 |
| commit | 638d74d43f9baf45dc3641939eec36f801414187 (patch) | |
| tree | 5bfcabbb83a6e7359cfc302cdc604264560d66a0 /epan/dissectors/packet-nbns.c | |
| parent | e6ffe7b59b9f36c534d3b2d6cc78b05dfe517f67 (diff) | |
Use val_to_str_const() where appropriate;
Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc
svn path=/trunk/; revision=44438
Diffstat (limited to 'epan/dissectors/packet-nbns.c')
| -rw-r--r-- | epan/dissectors/packet-nbns.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index f6d1abed30..bec18b4cc0 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -468,16 +468,16 @@ nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, in #define MAX_BUF_SIZE (128+1) buf=ep_alloc(MAX_BUF_SIZE); opcode = (guint16) ((flags & F_OPCODE) >> OPCODE_SHIFT); - g_snprintf(buf, MAX_BUF_SIZE, "%s", val_to_str(opcode, opcode_vals, "Unknown operation")); + g_snprintf(buf, MAX_BUF_SIZE, "%s", val_to_str_const(opcode, opcode_vals, "Unknown operation")); if (flags & F_RESPONSE && !is_wack) { g_strlcat(buf, " response", MAX_BUF_SIZE); g_strlcat(buf, ", ", MAX_BUF_SIZE); - g_strlcat(buf, val_to_str(flags & F_RCODE, rcode_vals, "Unknown error"), MAX_BUF_SIZE); + g_strlcat(buf, val_to_str_const(flags & F_RCODE, rcode_vals, "Unknown error"), MAX_BUF_SIZE); buf[MAX_BUF_SIZE-1] = '\0'; if ((flags & F_RCODE)) col_append_fstr(cinfo, COL_INFO, ", %s", - val_to_str(flags & F_RCODE, rcode_vals, - "Unknown error")); + val_to_str_const(flags & F_RCODE, rcode_vals, + "Unknown error")); } tf = proto_tree_add_uint_format(nbns_tree, hf_nbns_flags, tvb, offset, 2, flags, "Flags: 0x%04x (%s)", flags, buf); @@ -521,7 +521,7 @@ nbns_add_nb_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset, gushort flags) }; buf=ep_alloc(MAX_BUF_SIZE); - g_snprintf(buf, MAX_BUF_SIZE, "%s", val_to_str(flags & NB_FLAGS_ONT, nb_flags_ont_vals, + g_snprintf(buf, MAX_BUF_SIZE, "%s", val_to_str_const(flags & NB_FLAGS_ONT, nb_flags_ont_vals, "Unknown")); g_strlcat(buf, ", ", MAX_BUF_SIZE); if (flags & NB_FLAGS_G) @@ -557,7 +557,7 @@ nbns_add_name_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset, }; buf=ep_alloc(MAX_BUF_SIZE); - g_snprintf(buf, MAX_BUF_SIZE, "%s", val_to_str(flags & NAME_FLAGS_ONT, name_flags_ont_vals, + g_snprintf(buf, MAX_BUF_SIZE, "%s", val_to_str_const(flags & NAME_FLAGS_ONT, name_flags_ont_vals, "Unknown")); g_strlcat(buf, ", ", MAX_BUF_SIZE); if (flags & NAME_FLAGS_G) |