diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-03-28 21:55:11 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-03-28 21:55:11 +0000 |
| commit | 8fd3ee05600dd7d0e6434e7eb824932c52000ce3 (patch) | |
| tree | dc1df6288600e883ed53ac7e43a38a2d03abb9f3 /epan/dissectors/packet-ipp.c | |
| parent | 32780e71e8ce8c8fd1898cbcb62f6bc8a59341f3 (diff) | |
Remove almost all of the casts I committed recently and in place of
them, add -Wno-pointer-sign to CFLAGS when gcc will accept it.
svn path=/trunk/; revision=21253
Diffstat (limited to 'epan/dissectors/packet-ipp.c')
| -rw-r--r-- | epan/dissectors/packet-ipp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 211571a56e..e05ce21309 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -480,18 +480,18 @@ add_integer_tree(proto_tree *tree, tvbuff_t *tvb, int offset, * ends in '-time' then assume they are timestamps instead * of integers. */ - name_val=(char*)tvb_get_ptr(tvb, offset + 1 + 2, name_length); - if( (name_length > 5) && name_val && !tvb_memeql(tvb, offset + 1 + 2 + name_length - 5, (guint8*)"-time", 5)){ + name_val=tvb_get_ptr(tvb, offset + 1 + 2, name_length); + if( (name_length > 5) && name_val && !tvb_memeql(tvb, offset + 1 + 2 + name_length - 5, "-time", 5)){ ti = proto_tree_add_text(tree, tvb, offset, 1 + 2 + name_length + 2 + value_length, "%s: %s", - format_text((guchar*)name_val, name_length), + format_text(name_val, name_length), abs_time_secs_to_str(tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2))); } else { ti = proto_tree_add_text(tree, tvb, offset, 1 + 2 + name_length + 2 + value_length, "%s: %u", - format_text((guchar*)name_val, name_length), + format_text(name_val, name_length), tvb_get_ntohl(tvb, offset + 1 + 2 + name_length + 2)); } } @@ -620,7 +620,7 @@ add_value_head(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, proto_tree_add_text(tree, tvb, offset, name_length, "Name: %s", format_text(nv, name_length)); if(name_val){ - *name_val=(char*)nv; + *name_val=nv; } } offset += name_length; |