diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-03-01 07:01:15 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-03-01 07:01:15 +0000 |
commit | b28516dc00dbe70de6bc0e653b4d8ae137cfe05a (patch) | |
tree | 3b4b377169f4ff83406f7744e79b8e41a11f282a | |
parent | 78f602dc9b80e6bc996bfc86521bcdfad3eb5dc1 (diff) | |
download | wireshark-b28516dc00dbe70de6bc0e653b4d8ae137cfe05a.tar.gz |
From Mike Morrin: A small patch to correct the name of the function proto_tree_add_split_bits_item_ret_val()
svn path=/trunk/; revision=41255
-rw-r--r-- | epan/dissectors/packet-csn1.c | 2 | ||||
-rw-r--r-- | epan/proto.c | 2 | ||||
-rw-r--r-- | epan/proto.h | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c index f9a3b549a1..944ac8809a 100644 --- a/epan/dissectors/packet-csn1.c +++ b/epan/dissectors/packet-csn1.c @@ -376,7 +376,7 @@ csnStreamDissector(proto_tree *tree, csnStream_t* ar, const CSN_DESCR* pDescr, t guint8 no_of_value_bits = (guint8) pDescr->i; guint64 value; - proto_tree_add_split_bits_ret_val(tree, *pDescr->serialize.hf_ptr, tvb, bit_offset, pDescr->descr.crumb_spec, &value); + proto_tree_add_split_bits_item_ret_val(tree, *pDescr->serialize.hf_ptr, tvb, bit_offset, pDescr->descr.crumb_spec, &value); if (no_of_value_bits <= 8) { pui8 = pui8DATA(data, pDescr->offset); diff --git a/epan/proto.c b/epan/proto.c index 45978dd286..7b1c76a0d7 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -7381,7 +7381,7 @@ _proto_tree_add_bits_ret_val(proto_tree *tree, const int hf_index, tvbuff_t *tvb } proto_item * -proto_tree_add_split_bits_ret_val(proto_tree *tree, const int hf_index, tvbuff_t *tvb, +proto_tree_add_split_bits_item_ret_val(proto_tree *tree, const int hf_index, tvbuff_t *tvb, const gint bit_offset, const crumb_spec_t *crumb_spec, guint64 *return_value) { diff --git a/epan/proto.h b/epan/proto.h index ff05d796d0..ddbb3bd88c 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -475,6 +475,8 @@ typedef proto_node proto_item; /* expert severities */ #define PI_SEVERITY_MASK 0x00F00000 /**< mask usually for internal use only! */ +/** Packet is commented */ +#define PI_COMMENT 0x00100000 /** Usual workflow, e.g. TCP connection establishing */ #define PI_CHAT 0x00200000 /** Notable messages, e.g. an application returned an "usual" error code like HTTP 404 */ @@ -1913,7 +1915,7 @@ proto_tree_add_bits_item(proto_tree *tree, const int hf_index, tvbuff_t *tvb, co @param return_value if a pointer is passed here the value is returned. @return the newly created item */ extern proto_item * -proto_tree_add_split_bits_ret_val(proto_tree *tree, const int hf_index, tvbuff_t *tvb, +proto_tree_add_split_bits_item_ret_val(proto_tree *tree, const int hf_index, tvbuff_t *tvb, const gint bit_offset, const crumb_spec_t *crumb_spec, guint64 *return_value); @@ -1924,7 +1926,7 @@ proto_tree_add_split_bits_ret_val(proto_tree *tree, const int hf_index, tvbuff_t * of contiguous bits, specified by one of an array of * crumb_spec elements. This function is normally called once * per crumb, after the call to - proto_tree_add_split_bits_ret_val + proto_tree_add_split_bits_item_ret_val @param tree the tree to append this item to @param hf_index field index. Fields for use with this function should have bitmask==0. @param tvb the tv buffer of the current data |