[master] ee9fbf5 Remove -u (unbuffered output) option.

Martin Blix Grydeland martin at varnish-cache.org
Tue Nov 19 17:37:57 CET 2013


commit ee9fbf50434343ff15bdead47c943866c92c96d3
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed Nov 6 10:35:59 2013 +0100

    Remove -u (unbuffered output) option.
    
    With proper flushing happening on idle, this option is obsolete.

diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index 2c216df..b17cf6e 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -80,7 +80,7 @@ openout(int append)
 
 	AN(LOG.w_arg);
 	if (LOG.B_opt)
-		LOG.fo = VSL_WriteOpen(VUT.vsl, LOG.w_arg, append, VUT.u_opt);
+		LOG.fo = VSL_WriteOpen(VUT.vsl, LOG.w_arg, append, 0);
 	else
 		LOG.fo = fopen(LOG.w_arg, append ? "a" : "w");
 	if (LOG.fo == NULL)
diff --git a/bin/varnishlog/varnishlog_options.h b/bin/varnishlog/varnishlog_options.h
index 676edde..a70793b 100644
--- a/bin/varnishlog/varnishlog_options.h
+++ b/bin/varnishlog/varnishlog_options.h
@@ -67,7 +67,6 @@ VUT_OPT_P
 VUT_OPT_q
 VUT_OPT_r
 VSL_OPT_T
-VUT_OPT_u
 VSL_OPT_v
 VUT_OPT_V
 LOG_OPT_w
diff --git a/include/vut.h b/include/vut.h
index 4ddecc1..4def288 100644
--- a/include/vut.h
+++ b/include/vut.h
@@ -43,7 +43,6 @@ struct VUT {
 	char		*P_arg;
 	char		*q_arg;
 	char		*r_arg;
-	int		u_opt;
 
 	/* State */
 	struct VSL_data	*vsl;
diff --git a/include/vut_options.h b/include/vut_options.h
index 53a1e56..1d942ed 100644
--- a/include/vut_options.h
+++ b/include/vut_options.h
@@ -78,11 +78,6 @@
 	    "Read log in binary file format from this file."		\
 	)
 
-#define VUT_OPT_u							\
-	VOPT("u", "[-u]", "Binary file output unbuffered",		\
-	    "Unbuffered binary file output mode."			\
-	)
-
 #define VUT_OPT_V							\
 	VOPT("V", "[-V]", "Version",					\
 	    "Print version information and exit."			\
diff --git a/lib/libvarnishtools/vut.c b/lib/libvarnishtools/vut.c
index 54c35c6..4cf04fe 100644
--- a/lib/libvarnishtools/vut.c
+++ b/lib/libvarnishtools/vut.c
@@ -156,10 +156,6 @@ VUT_Arg(int opt, const char *arg)
 		/* Binary file input */
 		REPLACE(VUT.r_arg, arg);
 		return (1);
-	case 'u':
-		/* Unbuffered binary output */
-		VUT.u_opt = 1;
-		return (1);
 	case 'V':
 		/* Print version number and exit */
 		VCS_Message(VUT.progname);



More information about the varnish-commit mailing list