aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ansi_801.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2007-04-26 06:39:29 +0000
committerAnders Broman <anders.broman@ericsson.com>2007-04-26 06:39:29 +0000
commitccac0e798358b53f4efea8988421f7a8c26ffaa5 (patch)
tree056e2cbe2413a66cd441208657cba4bf087c01cc /epan/dissectors/packet-ansi_801.c
parent066ce1b93828aa4355ba23d9c680b8efe3f750b9 (diff)
Change the signature of proto_tree_add_bits() and add proto_tree_add_bits_ret_val()
which will hopefully be more acceptable. Change name of tvb_get_bits() in ansi_801 svn path=/trunk/; revision=21594
Diffstat (limited to 'epan/dissectors/packet-ansi_801.c')
-rw-r--r--epan/dissectors/packet-ansi_801.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index a3b0716675..c788687f9a 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -94,7 +94,7 @@ static const guint8 bit_mask[] = {
};
guint64
-tvb_get_bits(tvbuff_t *tvb, guint32 *offset_p, guint8 *bit_offset_p, guint8 num_bits)
+ansi_801_tvb_get_bits(tvbuff_t *tvb, guint32 *offset_p, guint8 *bit_offset_p, guint8 num_bits)
{
guint64 bits;
guint64 temp_octs;
@@ -1059,14 +1059,14 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
if (oct & bit_mask)
{
new_offset = offset;
- temp_int = tvb_get_bits(tvb, &new_offset, &bit_offset, 18);
+ temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 18);
proto_tree_add_text(tree, tvb, offset, new_offset - offset,
"CLOCK_BIAS: (%llu)",
temp_int);
offset = new_offset;
- temp_int = tvb_get_bits(tvb, &new_offset, &bit_offset, 16);
+ temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 16);
proto_tree_add_text(tree, tvb, offset, new_offset - offset,
"CLOCK_DRIFT: (%llu)",
@@ -1144,14 +1144,14 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
if (oct & bit_mask)
{
new_offset = offset;
- temp_int = tvb_get_bits(tvb, &new_offset, &bit_offset, 14);
+ temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 14);
proto_tree_add_text(tree, tvb, offset, new_offset - offset,
"HEIGHT: (%llu)",
temp_int);
offset = new_offset;
- temp_int = tvb_get_bits(tvb, &new_offset, &bit_offset, 5);
+ temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 5);
proto_tree_add_text(tree, tvb, offset, new_offset - offset,
"LOC_UNCRTNTY_V: (%llu)",
@@ -1229,7 +1229,7 @@ for_pr_gps_sat_health(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset
for (i=0; i < num_bad; i++)
{
- temp_int = tvb_get_bits(tvb, &new_offset, &bit_offset, 5);
+ temp_int = ansi_801_tvb_get_bits(tvb, &new_offset, &bit_offset, 5);
proto_tree_add_text(tree, tvb, offset, 1,
"BAD_SV_PRN_NUM: (%llu)",