diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-03-27 22:50:11 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-03-27 22:50:11 +0000 |
| commit | ab8f589336e61170090c0ac07eb266a295f3bdfb (patch) | |
| tree | d6caa166a922ab9201a06c6827d5408546e38be8 /epan/dissectors/packet-afp.c | |
| parent | ddddf2d668e2ef29c6902da10cbd4ffd4f772e47 (diff) | |
| download | wireshark-ab8f589336e61170090c0ac07eb266a295f3bdfb.tar.gz wireshark-ab8f589336e61170090c0ac07eb266a295f3bdfb.tar.bz2 wireshark-ab8f589336e61170090c0ac07eb266a295f3bdfb.zip | |
Fix about 100 simple to fix warnings from gcc 4.0 in epan/dissectors
svn path=/trunk/; revision=21233
Diffstat (limited to 'epan/dissectors/packet-afp.c')
| -rw-r--r-- | epan/dissectors/packet-afp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index c702a5d817..8fb00ac0fc 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -1590,7 +1590,8 @@ name_in_bitmap(tvbuff_t *tvb, gint offset, guint16 bitmap, int isdir) tp_ofs = nameoff +org_offset; len = tvb_get_guint8(tvb, tp_ofs); tp_ofs++; - name = tvb_get_ephemeral_string(tvb, tp_ofs, len); + name = (gchar*)tvb_get_ephemeral_string(tvb, tp_ofs, + len); return name; } offset += 2; @@ -1628,7 +1629,8 @@ name_in_bitmap(tvbuff_t *tvb, gint offset, guint16 bitmap, int isdir) tp_ofs = nameoff +org_offset +4; len16 = tvb_get_ntohs(tvb, tp_ofs); tp_ofs += 2; - name = tvb_get_ephemeral_string(tvb, tp_ofs, len16); + name = (gchar*)tvb_get_ephemeral_string(tvb, tp_ofs, + len16); return name; } } @@ -2391,7 +2393,7 @@ dissect_query_afp_login(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(tree, hf_afp_AFPVersion, tvb, offset, 1,FALSE); offset += len +1; len_uam = tvb_get_guint8(tvb, offset); - uam = tvb_get_ptr(tvb, offset +1, len_uam); + uam = (char*)tvb_get_ptr(tvb, offset +1, len_uam); proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1,FALSE); offset += len_uam +1; @@ -2426,7 +2428,7 @@ dissect_query_afp_login_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t offset += len +1; len_uam = tvb_get_guint8(tvb, offset); - uam = tvb_get_ptr(tvb, offset +1, len_uam); + uam = (char*)tvb_get_ptr(tvb, offset +1, len_uam); proto_tree_add_item(tree, hf_afp_UAM, tvb, offset, 1,FALSE); offset += len_uam +1; |