diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-10-08 19:45:41 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-10-09 17:13:39 +0000 |
| commit | 39b281461d6113134bd5203bca9b4ca27b146cda (patch) | |
| tree | d76604ebbe6cc2948b5f3d315ba73c54a18e731d /epan/dissectors/packet-dns.c | |
| parent | 1c510753760e94ee8df67733f5bd500921848764 (diff) | |
Eliminate proto_tree_add_text from packet-nbns.c
Some other cleanup while in the neighborhood. Not sure the all the proto_tree_add_expert calls are needed after each field (having implicit bounds error thrown should be sufficient), but left them in there.
Change-Id: I3ca75ec9f51ccbed6b6ca792789daa8e7cebf34a
Reviewed-on: https://code.wireshark.org/review/4574
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dns.c')
| -rw-r--r-- | epan/dissectors/packet-dns.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 086ac096e4..1abe0ca976 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -998,7 +998,7 @@ static const value_string gw_type_vals[] = { { 0, NULL } }; -static const value_string dns_classes[] = { +const value_string dns_classes[] = { {C_IN, "IN"}, {C_CS, "CS"}, {C_CH, "CH"}, @@ -1007,11 +1007,6 @@ static const value_string dns_classes[] = { {C_ANY, "ANY"}, {0,NULL} }; -const char * -dns_class_name(int dns_class) -{ - return val_to_str(dns_class, dns_classes, "Unknown (%u)"); -} /* This function returns the number of bytes consumed and the expanded string * in *name. @@ -1323,7 +1318,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset, } if (dns_tree != NULL) { q_tree = proto_tree_add_subtree_format(dns_tree, tvb, offset, len, ett_dns_qd, &tq, "%s: type %s, class %s", - name_out, type_name, dns_class_name(dns_class)); + name_out, type_name, val_to_str_const(dns_class, dns_classes, "Unknown")); if (is_mdns) { proto_item_append_text(tq, ", \"%s\" question", qu ? "QU" : "QM"); } @@ -1640,7 +1635,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, flush = 0; } type_name = val_to_str_ext(dns_type, &dns_types_vals_ext, "Unknown (%d)"); - class_name = dns_class_name(dns_class); + class_name = val_to_str_const(dns_class, dns_classes, "Unknown"); data_offset += 4; cur_offset += 4; |