[4.1] 82a09dc minor polish

[Poul-Henning Kamp]

commit 82a09dcd12269368517aa40acdf3f24cdf30f52f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jul 27 07:20:07 2015 +0000

    minor polish

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index aa1f4cf..539fee1 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -883,7 +883,7 @@ static enum fetch_step
 vbf_stp_done(void)
 {
 	WRONG("Just plain wrong");
-	return (F_STP_DONE);
+	NEEDLESS_RETURN(F_STP_DONE);
 }
 
 static void __match_proto__(task_func_t)
diff --git a/lib/libvcc/vcc_storage.c b/lib/libvcc/vcc_storage.c
index 89e63b0..b78d2f4 100644
--- a/lib/libvcc/vcc_storage.c
+++ b/lib/libvcc/vcc_storage.c
@@ -76,11 +76,10 @@ vcc_Stv_mkvar(struct vcc *tl, const struct token *t, enum var_type fmt)
 	AN(v);
 
 	v->name = TlDupTok(tl, t);
-	v->r_methods = 0
-#define VCL_MET_MAC(l,u,b)	| VCL_MET_##u
+	v->r_methods = 0;
+#define VCL_MET_MAC(l,u,b)	v->r_methods |= VCL_MET_##u;
 #include "tbl/vcl_returns.h"
 #undef VCL_MET_MAC
-		;
 	v->fmt = fmt;
 
 	return (v);