r4801 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-05-17 12:24:12 +0200 (Mon, 17 May 2010)
New Revision: 4801

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_shmem.c
Log:
Minor polishing



Modified: trunk/varnish-cache/bin/varnishd/mgt_shmem.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_shmem.c	2010-05-17 10:11:15 UTC (rev 4800)
+++ trunk/varnish-cache/bin/varnishd/mgt_shmem.c	2010-05-17 10:24:12 UTC (rev 4801)
@@ -240,7 +240,7 @@
 
 	/* Fill or not ? */
 	if (*ap != NULL) {
-		if (*ap == '\0')
+		if (**ap == '\0')
 			fill = 1;
 		else if (!strcmp(*ap, "-"))
 			fill = 0;
@@ -253,6 +253,9 @@
 		fill = 1;
 	}
 
+	if (*ap != NULL) 
+		ARGV_ERR("\t-l ...:  Too many sub-args\n");
+
 	FreeArgv(av);
 
 	size = s1 + s2;
@@ -260,9 +263,6 @@
 	size += ps - 1;
 	size &= ~(ps - 1);
 
-	if (av[2] == NULL)
-		q = str2bytes(av[2], &size, 0);
-
 	i = open(fn, O_RDWR, 0644);
 	if (i >= 0 && vsl_goodold(i, size, s2)) {
 		fprintf(stderr, "Using old SHMFILE\n");