diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-07-12 08:52:59 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-07-12 08:52:59 +0000 |
| commit | 8b9e7133eb13969e02a28987d07121309c0e665d (patch) | |
| tree | 453fca79898ff95217c554f5bb235f1d0d9378c6 /packet-mount.c | |
| parent | fa31197bd0d5a02e67cf4bf629446b1b17cc69f6 (diff) | |
| download | wireshark-8b9e7133eb13969e02a28987d07121309c0e665d.tar.gz wireshark-8b9e7133eb13969e02a28987d07121309c0e665d.tar.bz2 wireshark-8b9e7133eb13969e02a28987d07121309c0e665d.zip | |
From Heikki Vatiainen: fix to previous checkin (I guess some platforms
allow the redefinition of "strlen", as it compiled on at least some
platforms).
svn path=/trunk/; revision=3697
Diffstat (limited to 'packet-mount.c')
| -rw-r--r-- | packet-mount.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-mount.c b/packet-mount.c index afe57b20ea..f81103d4e0 100644 --- a/packet-mount.c +++ b/packet-mount.c @@ -1,7 +1,7 @@ /* packet-mount.c * Routines for mount dissection * - * $Id: packet-mount.c,v 1.26 2001/07/12 07:06:25 guy Exp $ + * $Id: packet-mount.c,v 1.27 2001/07/12 08:52:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -186,16 +186,16 @@ dissect_mount_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr static int dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - int len,strlen; + int len,str_len; len=tvb_get_ntohl(tvb,offset); - strlen=tvb_get_nstringz(tvb,offset+4, + str_len=tvb_get_nstringz(tvb,offset+4, MAX_GROUP_NAME_LIST-5-group_names_len, group_name_list+group_names_len); - if((group_names_len>=(MAX_GROUP_NAME_LIST-5))||(strlen<0)){ + if((group_names_len>=(MAX_GROUP_NAME_LIST-5))||(str_len<0)){ strcpy(group_name_list+(MAX_GROUP_NAME_LIST-5),"..."); group_names_len=MAX_GROUP_NAME_LIST-1; } else { - group_names_len+=strlen; + group_names_len+=str_len; group_name_list[group_names_len++]=' '; } group_name_list[group_names_len]=0; |