[master] cff85bf White space OCD

[Poul-Henning Kamp]

commit cff85bf81b7871cc804226456a452413a2d7e05b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 11 10:04:23 2015 +0000

    White space OCD

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index f9de015..d46bee8 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -936,23 +936,23 @@ sighup(void)
 static char *
 read_format(const char *formatfile)
 {
-        FILE *fmtfile;
-        size_t len = 0;
-        char *fmt = NULL;
-
-        fmtfile = fopen(formatfile, "r");
-        if (fmtfile == NULL)
-                VUT_Error(1, "Can't open format file (%s)", strerror(errno));
-        if (getline(&fmt, &len, fmtfile) == -1) {
-                free(fmt);
-                if (feof(fmtfile))
-                        VUT_Error(1, "Empty format file");
-                else
-                        VUT_Error(1, "Can't read format from file (%s)",
+	FILE *fmtfile;
+	size_t len = 0;
+	char *fmt = NULL;
+
+	fmtfile = fopen(formatfile, "r");
+	if (fmtfile == NULL)
+		VUT_Error(1, "Can't open format file (%s)", strerror(errno));
+	if (getline(&fmt, &len, fmtfile) == -1) {
+		free(fmt);
+		if (feof(fmtfile))
+			VUT_Error(1, "Empty format file");
+		else
+			VUT_Error(1, "Can't read format from file (%s)",
 			    strerror(errno));
-        }
-        fclose(fmtfile);
-        return (fmt);
+	}
+	fclose(fmtfile);
+	return (fmt);
 }
 
 int
diff --git a/bin/varnishncsa/varnishncsa_options.h b/bin/varnishncsa/varnishncsa_options.h
index 24567c2..f141ad0 100644
--- a/bin/varnishncsa/varnishncsa_options.h
+++ b/bin/varnishncsa/varnishncsa_options.h
@@ -40,10 +40,10 @@
 	    "Set the output log format string."				\
 	)
 
-#define NCSA_OPT_f                                                      \
-        VOPT("f:", "[-f formatfile]", "Read output format from file",   \
-            "Read output format from a file. Will read a single line"   \
-            " from the specified file, and use that line as the"	\
+#define NCSA_OPT_f							\
+	VOPT("f:", "[-f formatfile]", "Read output format from file",   \
+	    "Read output format from a file. Will read a single line"   \
+	    " from the specified file, and use that line as the"	\
 	    " format."							\
 	)