[master] 9d29b38 Polish, mostly for coverage purposes

[Federico G. Schwindt]

commit 9d29b38612a74c443e40434a9093a297845c194c
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jan 10 21:02:52 2017 +0000

    Polish, mostly for coverage purposes

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index e90df71..b3823d8 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -484,9 +484,8 @@ main(int argc, char * const *argv)
 	argv += optind;
 
 	if (n_arg != NULL) {
-		if (T_arg != NULL || S_arg != NULL) {
+		if (T_arg != NULL || S_arg != NULL)
 			usage(1);
-		}
 		sock = n_arg_sock(n_arg);
 	} else if (T_arg == NULL) {
 		sock = n_arg_sock("");
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index b4766b2..5d3126b 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -644,15 +644,31 @@ main(int argc, char * const *argv)
 	 */
 	while ((o = getopt(argc, argv, opt_spec)) != -1) {
 		switch (o) {
-			case '?': usage(); break;
-			case 'b': b_arg = optarg; break;
-			case 'C': C_flag = 1; break;
-			case 'd': d_flag++; break;
-			case 'f': f_arg = optarg; break;
-			case 'F': F_flag = 1; break;
-			case 'j': j_arg = optarg; break;
-			case 'x': x_arg = optarg; break;
-			default: break;
+		case '?':
+			usage();
+		case 'b':
+			b_arg = optarg;
+			break;
+		case 'C':
+			C_flag = 1;
+			break;
+		case 'd':
+			d_flag++;
+			break;
+		case 'f':
+			f_arg = optarg;
+			break;
+		case 'F':
+			F_flag = 1;
+			break;
+		case 'j':
+			j_arg = optarg;
+			break;
+		case 'x':
+			x_arg = optarg;
+			break;
+		default:
+			break;
 		}
 	}
 
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index c5d9d92..b61512d 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -137,7 +137,6 @@ main(int argc, char * const *argv)
 		case 'h':
 			/* Usage help */
 			usage(0);
-			break;
 		case 'w':
 			/* Write to file */
 			REPLACE(LOG.w_arg, optarg);