diff options
author | Bill Meier <wmeier@newsguy.com> | 2011-10-05 01:00:06 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2011-10-05 01:00:06 +0000 |
commit | ef8009abe3327a460c028cd81258b6590974f2a8 (patch) | |
tree | 502b5a72f83e524f032991e17a8f1bf71d9942c0 /plugins/irda | |
parent | 799578fb29a901adef58f6792b01c3e580fb577a (diff) |
Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
FT_BYTES
FT_IPV6
FT_IPXNET
FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39262
Diffstat (limited to 'plugins/irda')
-rw-r--r-- | plugins/irda/packet-ircomm.c | 4 | ||||
-rw-r--r-- | plugins/irda/packet-irda.c | 18 | ||||
-rw-r--r-- | plugins/irda/packet-sir.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index 8a7a2f2114..91b4dc5de6 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -196,7 +196,7 @@ static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* proto_tree* ctrl_tree; - ti = proto_tree_add_item(tree, hf_control, tvb, 0, clen + 1, FALSE); + ti = proto_tree_add_item(tree, hf_control, tvb, 0, clen + 1, ENC_NA); ctrl_tree = proto_item_add_subtree(ti, ett_ircomm_ctrl); proto_tree_add_item(ctrl_tree, hf_control_len, tvb, offset, 1, FALSE); offset++; @@ -267,7 +267,7 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet guint8 p_len = tvb_get_guint8(tvb, offset + 1); - ti = proto_tree_add_item(tree, hf_ircomm_param, tvb, offset, p_len + 2, FALSE); + ti = proto_tree_add_item(tree, hf_ircomm_param, tvb, offset, p_len + 2, ENC_NA); p_tree = proto_item_add_subtree(ti, ett_param[list_index * MAX_PARAMETERS + n]); buf[0] = 0; diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 593a43f071..6198508200 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -444,7 +444,7 @@ unsigned dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, unsigned offset) if (len > 0) { if (tree) - proto_tree_add_item(tree, hf_param_pv, tvb, offset, len, FALSE); + proto_tree_add_item(tree, hf_param_pv, tvb, offset, len, ENC_NA); offset += len; } @@ -805,7 +805,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro attr_len = 0; } - ti = proto_tree_add_item(tree, hf_iap_list_entry, tvb, offset, 2 + 1 + attr_len, FALSE); + ti = proto_tree_add_item(tree, hf_iap_list_entry, tvb, offset, 2 + 1 + attr_len, ENC_NA); proto_item_append_text(ti, "%d", n + 1); entry_tree = proto_item_add_subtree(ti, ett_iap_entry[n]); @@ -830,7 +830,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro !iap_conv->pattr_dissector->value_dissector(tvb, offset, pinfo, entry_tree, n, type)) proto_tree_add_item(entry_tree, hf_iap_oct_seq, tvb, offset + 2, - attr_len - 2, FALSE); + attr_len - 2, ENC_NA); break; case IAS_STRING: @@ -1266,7 +1266,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of if (tree) { - ti = proto_tree_add_item(tree, hf_negotiation_param, tvb, offset, p_len + 2, FALSE); + ti = proto_tree_add_item(tree, hf_negotiation_param, tvb, offset, p_len + 2, ENC_NA); p_tree = proto_item_add_subtree(ti, ett_param[n]); pv = tvb_get_guint8(tvb, offset+2); @@ -1473,7 +1473,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro if (lap_tree) { - ti = proto_tree_add_item(lap_tree, hf_lap_i, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(lap_tree, hf_lap_i, tvb, offset, -1, ENC_NA); i_tree = proto_item_add_subtree(ti, ett_lap_i); proto_tree_add_item(i_tree, hf_xid_ident, tvb, offset, 1, FALSE); @@ -1555,7 +1555,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro if (root) { - ti = proto_tree_add_item(lmp_tree, hf_lmp_xid_hints, tvb, offset, hints_len, FALSE); + ti = proto_tree_add_item(lmp_tree, hf_lmp_xid_hints, tvb, offset, hints_len, ENC_NA); if ((hint1 | hint2) != 0) { char service_hints[256]; @@ -1624,7 +1624,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro { if (root) proto_tree_add_item(lmp_tree, hf_lmp_xid_name_no_ascii, tvb, offset, - -1, FALSE); + -1, ENC_NA); } } } @@ -1769,7 +1769,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) case XDLC_SNRM: if (root) { - ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, ENC_NA); i_tree = proto_item_add_subtree(ti, ett_lap_i); } @@ -1816,7 +1816,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) { if (root) { - ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, ENC_NA); i_tree = proto_item_add_subtree(ti, ett_lap_i); } diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index bc8eb4c438..39f04f9ecc 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -158,7 +158,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) proto_tree* tree = proto_item_add_subtree(ti, ett_sir); if (preamble_len > 0) proto_tree_add_item(tree, hf_sir_preamble, tvb, - offset, preamble_len, FALSE); + offset, preamble_len, ENC_NA); proto_tree_add_item(tree, hf_sir_bof, tvb, bof_offset, 1, FALSE); proto_tree_add_uint(tree, hf_sir_length, |