samba-vscan/global vscan-fileaccesslog.c,1.8.2.3,1.8.2.4

Update of /cvsroot/openantivirus/samba-vscan/global
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20725/global

Modified Files:
      Tag: VSCAN_0_3
	vscan-fileaccesslog.c 
Log Message:
renamed "new" to "new_entry" to not use a reserved word in C++
(as Samba 3.0.20pre2 onwards Samba can be compiled with C++ and allows
VFS modules written in C++)


Index: vscan-fileaccesslog.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/global/vscan-fileaccesslog.c,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- vscan-fileaccesslog.c	24 Sep 2004 21:42:20 -0000	1.8.2.3
+++ vscan-fileaccesslog.c	13 Jul 2005 14:58:43 -0000	1.8.2.4
@@ -128,7 +128,7 @@
  *
 */
 struct lrufiles_struct *lrufiles_add(pstring fname, time_t mtime, BOOL infected) {
-	struct lrufiles_struct *new, *tmp, *found = NULL;
+	struct lrufiles_struct *new_entry, *tmp, *found = NULL;
 
 	/* check if lru file access was disabled by setting the corresponding
 	   value in the configuration file to zero (or below zero) */
@@ -150,15 +150,15 @@
 		return found;
 	} else {
 		DEBUG(10, ("alloc space for file entry '%s'\n", fname));
-		new = (struct lrufiles_struct *)malloc(sizeof(*new));
-		if (!new) return NULL;
+		new_entry = (struct lrufiles_struct *)malloc(sizeof(*new_entry));
+		if (!new_entry) return NULL;
 
-		ZERO_STRUCTP(new);
+		ZERO_STRUCTP(new_entry);
 
-		pstrcpy(new->fname, fname);
-		new->mtime = mtime;
-		new->infected = infected;
-		new->time_added = time(NULL);
+		pstrcpy(new_entry->fname, fname);
+		new_entry->mtime = mtime;
+		new_entry->infected = infected;
+		new_entry->time_added = time(NULL);
 
 		/* reached maximum? */
 		if ( lrufiles_count == lrufiles_max_entries ) {
@@ -170,12 +170,12 @@
 		}
 		
 		DEBUG(10, ("adding new entry to list...\n"));
-		DLIST_ADD_END(Lrufiles, new, tmp);
-		LrufilesEnd = new;
+		DLIST_ADD_END(Lrufiles, new_entry, tmp);
+		LrufilesEnd = new_entry;
 		lrufiles_count++;
 		DEBUG(10, ("entry '%s' added, count '%d'\n", fname, lrufiles_count));
 
-		return new;
+		return new_entry;
 	}
 }
 



-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar