Ethereal-dev: [Ethereal-dev] packet-mount.c compile problem

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Heikki Vatiainen <hessu@xxxxxxxxx>
Date: 12 Jul 2001 11:39:37 +0300
packet-mount.c failed to compile because of an identifier
collision.


Index: packet-mount.c
===================================================================
RCS file: /cvsroot/ethereal/packet-mount.c,v
retrieving revision 1.26
diff -u -r1.26 packet-mount.c
--- packet-mount.c	2001/07/12 07:06:25	1.26
+++ packet-mount.c	2001/07/12 08:37:33
@@ -186,16 +186,16 @@
 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;



-- 
Heikki Vatiainen                  * hessu@xxxxxxxxx
Tampere University of Technology  * Tampere, Finland