diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
| commit | 3eb06be97d520daef0bad19bf9c261b01abdc66d (patch) | |
| tree | 521ce26d4bc68c8e4158df7aa2af769ba60e93b9 /epan/dissectors/packet-mount.c | |
| parent | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48425
Diffstat (limited to 'epan/dissectors/packet-mount.c')
| -rw-r--r-- | epan/dissectors/packet-mount.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index 745845f1e7..e11f0d93dd 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -162,7 +162,7 @@ dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo, const char *mountpoint=NULL; if((!pinfo->fd->flags.visited) && nfs_file_name_snooping){ - rpc_call_info_value *civ=pinfo->private_data; + rpc_call_info_value *civ=(rpc_call_info_value *)pinfo->private_data; if(civ->request && (civ->proc==1)){ const gchar *host; @@ -170,12 +170,12 @@ dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 len; unsigned char *ptr; - host=ip_to_str(pinfo->dst.data); + host=ip_to_str((guint8 *)pinfo->dst.data); len=tvb_get_ntohl(tvb, offset); if (len >= ITEM_LABEL_LENGTH) THROW(ReportedBoundsError); - name=g_malloc(strlen(host)+1+len+1+200); + name=(unsigned char *)g_malloc(strlen(host)+1+len+1+200); ptr=name; memcpy(ptr, host, strlen(host)); ptr+=strlen(host); |