osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't pass a null format string to val_to_str(). 

svn path=/trunk/; revision=14167
This commit is contained in:
Gerald Combs 2005-04-22 15:18:56 +00:00
parent 42f80d7478
commit 3ed50e1ae7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ieee80211.c
View File

@ -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;

8
epan/dissectors/packet-q2931.c
View File

@ -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;

6
epan/dissectors/packet-q931.c
View File

@ -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;

2
epan/dissectors/packet-q933.c
View File

@ -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;