r1469 - trunk/varnish-cache/lib/libvarnish

[des at projects.linpro.no]

Author: des
Date: 2007-05-23 14:10:20 +0200 (Wed, 23 May 2007)
New Revision: 1469

Modified:
   trunk/varnish-cache/lib/libvarnish/flopen.c
Log:
Avoid shadowing truncate(2) with a local variable.


Modified: trunk/varnish-cache/lib/libvarnish/flopen.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/flopen.c	2007-05-23 10:07:49 UTC (rev 1468)
+++ trunk/varnish-cache/lib/libvarnish/flopen.c	2007-05-23 12:10:20 UTC (rev 1469)
@@ -26,7 +26,7 @@
  *
  * $Id$
  * Derived from:
- * $FreeBSD: src/lib/libutil/flopen.c,v 1.6 2007/05/23 10:06:03 des Exp $
+ * $FreeBSD: src/lib/libutil/flopen.c,v 1.7 2007/05/23 12:09:33 des Exp $
  */
 
 #include <sys/file.h>
@@ -42,7 +42,7 @@
 int
 flopen(const char *path, int flags, ...)
 {
-	int fd, operation, serrno, truncate;
+	int fd, operation, serrno, trunc;
 	struct stat sb, fsb;
 	mode_t mode;
 
@@ -63,7 +63,7 @@
 	if (flags & O_NONBLOCK)
 		operation |= LOCK_NB;
 
-	truncate = (flags & O_TRUNC);
+	trunc = (flags & O_TRUNC);
 	flags &= ~O_TRUNC;
 
 	for (;;) {
@@ -95,7 +95,7 @@
 			close(fd);
 			continue;
 		}
-		if (truncate && ftruncate(fd, 0) != 0) {
+		if (trunc && ftruncate(fd, 0) != 0) {
 			/* can't happen [tm] */
 			serrno = errno;
 			close(fd);