diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-06 03:35:44 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-06 03:35:44 +0000 |
| commit | 4e57694d4aa2a652077e01fd6867a8def7ffdb15 (patch) | |
| tree | 0896080ffb80104f2c23e3f8c273080088cff7cd /epan/dissectors/packet-collectd.c | |
| parent | aae5eb7de0e2fd5a257d143852b832039ebb171e (diff) | |
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_UINT8
FT_UINT16
FT_UINT24
FT_UINT32
FT_UINT64
FT_INT8
FT_INT16
FT_INT24
FT_INT32
FT_INT64
FT_FLOAT
FT_DOUBLE
svn path=/trunk/; revision=39288
Diffstat (limited to 'epan/dissectors/packet-collectd.c')
| -rw-r--r-- | epan/dissectors/packet-collectd.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index d2706809c4..29768da3ef 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -432,10 +432,10 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_counter, tvb, - value_offset, 8, FALSE); + value_offset, 8, ENC_BIG_ENDIAN); break; } @@ -451,11 +451,11 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); /* Set the `little endian' flag to TRUE here, because * collectd stores doubles in x86 representation. */ proto_tree_add_item (value_tree, hf_collectd_val_gauge, - tvb, value_offset, 8, TRUE); + tvb, value_offset, 8, ENC_LITTLE_ENDIAN); break; } @@ -471,10 +471,10 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_derive, tvb, - value_offset, 8, FALSE); + value_offset, 8, ENC_BIG_ENDIAN); break; } @@ -490,10 +490,10 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_absolute, tvb, - value_offset, 8, FALSE); + value_offset, 8, ENC_BIG_ENDIAN); break; } @@ -510,9 +510,9 @@ dissect_collectd_values(tvbuff_t *tvb, gint msg_off, gint val_cnt, value_tree = proto_item_add_subtree (pi, ett_collectd_valinfo); proto_tree_add_item (value_tree, hf_collectd_val_type, - tvb, value_type_offset, 1, FALSE); + tvb, value_type_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item (value_tree, hf_collectd_val_unknown, - tvb, value_offset, 8, FALSE); + tvb, value_offset, 8, ENC_BIG_ENDIAN); break; } } /* switch (value_type) */ @@ -602,7 +602,7 @@ dissect_collectd_part_values (tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree_add_uint (pt, hf_collectd_length, tvb, offset + 2, 2, length); pi = proto_tree_add_item (pt, hf_collectd_data_valcnt, tvb, - offset + 4, 2, FALSE); + offset + 4, 2, ENC_BIG_ENDIAN); if (values_count != corrected_values_count) expert_add_info_format (pinfo, pi, PI_MALFORMED, PI_WARN, "Number of values and length of part do not match. " |