diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-03-27 22:50:11 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-03-27 22:50:11 +0000 |
| commit | 262e9603cc96f769b6b56ece2aade338cdc8ba6a (patch) | |
| tree | d6caa166a922ab9201a06c6827d5408546e38be8 /epan/dissectors/packet-ipp.c | |
| parent | 406b553ac0aa13c9e1f06f4803b373296ec4cde0 (diff) | |
Fix about 100 simple to fix warnings from gcc 4.0 in epan/dissectors
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21233 f5534014-38df-0310-8fa8-9805f1628bb7
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 e05ce21309..211571a56e 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=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)){ + 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)){ ti = proto_tree_add_text(tree, tvb, offset, 1 + 2 + name_length + 2 + value_length, "%s: %s", - format_text(name_val, name_length), + format_text((guchar*)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(name_val, name_length), + format_text((guchar*)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=nv; + *name_val=(char*)nv; } } offset += name_length; |