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

Convert proto_tree_add_uint64_format calls to proto_tree_add_uint64_format_value where appropriate. 

svn path=/trunk/; revision=52299
This commit is contained in:
Michael Mann 2013-09-30 15:52:24 +00:00
parent 47bca84efb
commit ffaeb8a433
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-ieee80211-airopeek.c
View File

@ -61,9 +61,9 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
data_rate / 2,
data_rate & 1 ? 5 : 0);
if (tree) {
proto_tree_add_uint64_format(airopeek_tree, hf_data_rate, tvb, 0, 1,
proto_tree_add_uint64_format_value(airopeek_tree, hf_data_rate, tvb, 0, 1,
(guint64)data_rate * 500000,
"Data Rate: %u.%u Mb/s",
"%u.%u Mb/s",
data_rate / 2,
data_rate & 1 ? 5 : 0);
}

4
epan/dissectors/packet-ieee80211-radio.c
View File

@ -79,9 +79,9 @@ dissect_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
ti = proto_tree_add_item(tree, proto_radio, tvb, 0, 0, ENC_NA);
radio_tree = proto_item_add_subtree (ti, ett_radio);
proto_tree_add_uint64_format(radio_tree, hf_data_rate, tvb, 0, 0,
proto_tree_add_uint64_format_value(radio_tree, hf_data_rate, tvb, 0, 0,
(guint64)pinfo->pseudo_header->ieee_802_11.data_rate * 500000,
"Data Rate: %u.%u Mb/s",
"%u.%u Mb/s",
pinfo->pseudo_header->ieee_802_11.data_rate / 2,
pinfo->pseudo_header->ieee_802_11.data_rate & 1 ? 5 : 0);

4
epan/dissectors/packet-ieee80211-wlancap.c
View File

@ -418,9 +418,9 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
datarate / 1000000,
((datarate % 1000000) > 500000) ? 5 : 0);
if (tree) {
proto_tree_add_uint64_format(wlan_tree, hf_data_rate, tvb, offset, 4,
proto_tree_add_uint64_format_value(wlan_tree, hf_data_rate, tvb, offset, 4,
datarate,
"Data Rate: %u.%u Mb/s",
"%u.%u Mb/s",
datarate/1000000,
((datarate % 1000000) > 500000) ? 5 : 0);
}

12
epan/dissectors/packet-ixveriwave.c
View File

@ -413,9 +413,9 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
if (vw_times_tree != NULL) {
proto_tree_add_uint64_format(vw_times_tree, hf_ixveriwave_vw_startt,
proto_tree_add_uint64_format_value(vw_times_tree, hf_ixveriwave_vw_startt,
tvb, offset, 8, vw_startt,
"Frame start timestamp: %" G_GINT64_MODIFIER "u usec", vw_startt);
"%" G_GINT64_MODIFIER "u usec", vw_startt);
}
}
@ -429,9 +429,9 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
if (vw_times_tree != NULL) {
proto_tree_add_uint64_format(vw_times_tree, hf_ixveriwave_vw_endt,
proto_tree_add_uint64_format_value(vw_times_tree, hf_ixveriwave_vw_endt,
tvb, offset, 8, vw_endt,
"Frame end timestamp: %" G_GINT64_MODIFIER "u usec", vw_endt);
"%" G_GINT64_MODIFIER "u usec", vw_endt);
}
}
@ -1064,11 +1064,11 @@ void proto_register_ixveriwave(void)
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_ixveriwave_vw_startt,
{ "Starting frame timestamp", "ixveriwave.startt",
{ "Frame start timestamp", "ixveriwave.startt",
FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_ixveriwave_vw_endt,
{ "Ending frame timestamp", "ixveriwave.endt",
{ "Frame end timestamp", "ixveriwave.endt",
FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_ixveriwave_vw_pktdur,

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

@ -1180,9 +1180,9 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint64 timestamp;
timestamp = tvb_get_ntoh64 (tvb, offset);
proto_tree_add_uint64_format (p_mul_tree, hf_timestamp_option, tvb,
proto_tree_add_uint64_format_value(p_mul_tree, hf_timestamp_option, tvb,
offset, 8, timestamp,
"Timestamp: %" G_GINT64_MODIFIER "d.%d second%s (%" G_GINT64_MODIFIER "u)",
"%" G_GINT64_MODIFIER "d.%d second%s (%" G_GINT64_MODIFIER "u)",
timestamp / 10, (int) timestamp % 10,
(timestamp == 10) ? "" : "s", timestamp);
offset += 8;
@ -1427,7 +1427,7 @@ void proto_register_p_mul (void)
"p_mul.no_missing_seq_no", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL } },
{ &hf_timestamp_option,
{ "Timestamp Option", "p_mul.timestamp", FT_UINT64, BASE_DEC,
{ "Timestamp", "p_mul.timestamp", FT_UINT64, BASE_DEC,
NULL, 0x0, "Timestamp Option (in units of 100ms)", HFILL } },
{ &hf_dest_entry,
{ "Destination Entry", "p_mul.dest_entry", FT_NONE, BASE_NONE,