diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-12-19 17:39:52 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-12-19 17:39:52 +0000 |
| commit | 4a1aa4a214410eb8a5f529961d69bf18cbc770aa (patch) | |
| tree | 647f2501114c1f15b0c01fc84cbb6cdad96a3580 /plugins | |
| parent | 3af7385e48e13cde8ca001915e4a9578872b3400 (diff) | |
Back out r27047 and r27053.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27062 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/asn1/packet-asn1.c | 4 | ||||
| -rw-r--r-- | plugins/rtnet/packet-rtnet.c | 2 | ||||
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index e5e97ae28b..9c0eb9b9ce 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -1338,7 +1338,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in ename, empty); else { proto_tree_add_bytes_format(pt, props.value_id, tvb, boffset, - offset - boffset, + offset - boffset, ename,/* XXX length?*/ "(%s)%s: %s ~", tname, name, ename); if (props.type_id != -1){ hidden_item = proto_tree_add_bytes(pt, props.type_id, tvb, @@ -1355,7 +1355,7 @@ decode_asn1_sequence(tvbuff_t *tvb, guint offset, guint tlen, proto_tree *pt, in "(%s)%s: %s", tname, name, ename); else { proto_tree_add_bytes_format(pt, props.value_id, tvb, boffset, - offset - boffset, + offset - boffset, ename, /* XXX length ? */ "(%s)%s: %s ~", tname, name, ename); if (props.type_id != -1){ hidden_item = proto_tree_add_bytes(pt, props.type_id, tvb, diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c index eccdaf42f8..a485229287 100644 --- a/plugins/rtnet/packet-rtnet.c +++ b/plugins/rtnet/packet-rtnet.c @@ -888,7 +888,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case WTAP_ENCAP_ETHERNET: haddr = tvb_get_ptr(tvb, offset, 6); proto_tree_add_bytes_format( rtcfg_tree, hf_rtcfg_client_hw_address, tvb, offset, 32, - "Client Hardware Address: %02X:%02X:%02X:%02X:%02X:%02X", + haddr, "Client Hardware Address: %02X:%02X:%02X:%02X:%02X:%02X", *haddr, *(haddr+1), *(haddr+2), *(haddr+3), *(haddr+4), *(haddr+5) ); break; diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 0dcb1cea0d..3beeddadea 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -919,7 +919,7 @@ static void wimaxasncp_dissect_tlv_value( proto_tree_add_bytes_format( tree, tlv_info->hf_value, - tvb, offset, length, + tvb, offset, length, p, format1, s); proto_item_append_text( @@ -1098,7 +1098,7 @@ static void wimaxasncp_dissect_tlv_value( proto_tree_add_bytes_format( tree, tlv_info->hf_value, - tvb, offset, length, + tvb, offset, length, p, format, hex_note, s); proto_item_append_text(tlv_item, " - TBD"); @@ -1624,7 +1624,7 @@ static void wimaxasncp_dissect_tlv_value( proto_tree_add_bytes_format( tree, tlv_info->hf_value, - tvb, offset, length, + tvb, offset, length, p, format1, hex_note, s); proto_item_append_text( @@ -1662,7 +1662,7 @@ static void wimaxasncp_dissect_tlv_value( proto_tree_add_bytes_format( tree, hf_wimaxasncp_tlv_value_bytes, - tvb, offset, length, + tvb, offset, length, p, format, hex_note, s); } } |