diff options
author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-04-22 15:18:56 +0000 |
---|---|---|
committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-04-22 15:18:56 +0000 |
commit | 62d150a3b677e9c9e73133770e9bab5abdc6959d (patch) | |
tree | e9a2605576b72eceff34042e9111f9d79aff989f | |
parent | df8dc9f05921d2e87a2c391a3b08ef827e9fa01f (diff) |
Don't pass a null format string to val_to_str().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14167 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | epan/dissectors/packet-ieee80211.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-q2931.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-q931.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-q933.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 129b90e3e0..af22eb1c73 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -990,7 +990,7 @@ dissect_vendor_specific_ie(proto_tree * tree, tvbuff_t * tvb, int offset, offset += 2; tag_val_off += 2; - while ((field = val_to_str(tag_val_off, fields, NULL))) { + while ((field = val_to_str(tag_val_off, fields, "Unknown"))) { snprintf(out_buff, SHORT_STR, "WME TSPEC: %s %u", field, tvb_get_letohl(tvb, offset)); proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff); offset += 4; diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index db34e3286e..167fbda1ee 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -589,7 +589,7 @@ dissect_q2931_atm_cell_rate_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_text(tree, tvb, offset, 4, "%s: %u cell%s/s", val_to_str(identifier, q2931_atm_td_subfield_vals, - NULL), + "Unknown (0x%02X)"), value, plurality(value, "", "s")); offset += 4; len -= 4; @@ -600,7 +600,7 @@ dissect_q2931_atm_cell_rate_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(identifier, q2931_atm_td_subfield_vals, - NULL)); + "Unknown (0x%02X)")); offset += 1; len -= 1; break; @@ -612,7 +612,7 @@ dissect_q2931_atm_cell_rate_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_text(tree, tvb, offset, 2, "%s", val_to_str(identifier, q2931_atm_td_subfield_vals, - NULL)); + "Unknown (0x%02X)")); proto_tree_add_text(tree, tvb, offset + 1, 1, "%s allowed in forward direction", (value & 0x80) ? "Frame discard" : "No frame discard"); @@ -1484,7 +1484,7 @@ dissect_q2931_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_text(tree, tvb, offset, 1, "Odd/even indicator: %s", val_to_str(octet & 0x10, q2931_odd_even_indicator_vals, - NULL)); + "Unknown (0x%02X)")); offset += 1; len -= 1; diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 513c1807a4..53e0487657 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -1464,7 +1464,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_text(tree, tvb, offset, 1, "Channel selection: %s", val_to_str(octet & 0x03, q931_basic_channel_selection_vals, - NULL)); + "Unknown (0x%02X)")); } offset += 1; len -= 1; @@ -1931,7 +1931,7 @@ dissect_q931_pl_binary_parameters_ie(tvbuff_t *tvb, int offset, int len, octet = tvb_get_guint8(tvb, offset); proto_tree_add_text(tree, tvb, offset, 1, "Fast select: %s", - val_to_str(octet & 0x18, q931_fast_selected_vals, NULL)); + val_to_str(octet & 0x18, q931_fast_selected_vals, "Unknown (0x%02X)")); proto_tree_add_text(tree, tvb, offset, 1, "%s", (octet & 0x04) ? "No request/request denied" : @@ -2178,7 +2178,7 @@ dissect_q931_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_text(tree, tvb, offset, 1, "Odd/even indicator: %s", val_to_str(octet & 0x10, q931_odd_even_indicator_vals, - NULL)); + "Unknown (0x%02X)")); offset += 1; len -= 1; diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index cbdaea9d04..0fcc88d4ab 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -1715,7 +1715,7 @@ dissect_q933_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_text(tree, tvb, offset, 1, "Odd/even indicator: %s", val_to_str(octet & 0x10, q933_odd_even_indicator_vals, - NULL)); + "Unknown (0x%02X)")); offset += 1; len -= 1; |