Clean out some silly imprecisions, clearing the build

Some minor nitpicking and some slightly ugly stuff. It currently fails a
regression test (v00017.vtc). I'm on it.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5063 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_backend.h

@@ -143,6 +143,7 @@ struct backend {
 
 /* cache_backend.c */
 void VBE_ReleaseConn(struct vbe_conn *vc);
+struct backend *vdi_get_backend_if_simple(const struct director *d);
 
 /* cache_backend_cfg.c */
 extern struct lock VBE_mtx;
@@ -158,6 +159,7 @@ void VBP_Stop(struct backend *b);
 /* Init functions for directors */
 typedef void dir_init_f(struct cli *, struct director **, int , const void*);
 dir_init_f VRT_init_dir_simple;
+dir_init_f VRT_init_dir_dns;
 dir_init_f VRT_init_dir_hash;
 dir_init_f VRT_init_dir_random;
 dir_init_f VRT_init_dir_round_robin;

bin/varnishd/cache_dir_dns.c

@@ -124,9 +124,6 @@ vdi_dns_comp_addrinfo6(struct backend *bp,
 	return 1;
 }
 
-struct backend *
-vdi_get_backend_if_simple(const struct director *d);
-
 /* Check if a backends socket is the same as addr */
 static int
 vdi_dns_comp_addrinfo(struct director *dir,
@@ -387,7 +384,6 @@ vdi_dns_find_backend(const struct sess *sp, struct vdi_dns *vs)
 static struct vbe_conn *
 vdi_dns_getfd(const struct director *director, struct sess *sp)
 {
-	int i;
 	struct vdi_dns *vs;
 	struct director *dir;
 	struct vbe_conn *vbe;
@@ -407,6 +403,12 @@ vdi_dns_getfd(const struct director *director, struct sess *sp)
 static unsigned
 vdi_dns_healthy(double now, const struct director *dir, uintptr_t target)
 {
+	/* XXX: Fooling -Werror for a bit until it's actually implemented.
+	 */
+	if (now || dir || target)
+		return 1;
+	else
+		return 1;
 	return 1;
 	/*
 	struct vdi_dns *vs;
@@ -429,7 +431,6 @@ vdi_dns_healthy(double now, const struct director *dir, uintptr_t target)
 static void
 vdi_dns_fini(struct director *d)
 {
-	int i;
 	struct vdi_dns *vs;
 	struct director **vh;
 

lib/libvcl/vcc_compile.h

@@ -191,6 +191,10 @@ void vcc_ResetFldSpec(struct fld_spec *f);
 void vcc_IsField(struct vcc *tl, struct token **t, struct fld_spec *fs);
 void vcc_FieldsOk(struct vcc *tl, const struct fld_spec *fs);
 
+void Emit_Sockaddr(struct vcc *tl, const struct token *t_host, const char *port);
+void vcc_EmitBeIdent(const struct vcc *tl, struct vsb *v,
+	 int serial, const struct token *first, const struct token *last);
+
 /* vcc_compile.c */
 extern struct method method_tab[];
 /*

lib/libvcl/vcc_dir_dns.c

@@ -51,14 +51,6 @@ SVNID("$Id$")
  * Parse directors
  */
 
-
-void
-vcc_EmitBeIdent(const struct vcc *tl, struct vsb *v,
-    int serial, const struct token *first, const struct token *last);
-void
-Emit_Sockaddr(struct vcc *tl, const struct token *t_host,
-    const char *port);
-
 struct vcc_dir_backend_defaults {
 	char *port;
 	char *hostheader;
@@ -69,7 +61,7 @@ struct vcc_dir_backend_defaults {
 	unsigned saint;
 } b_defaults;
 
-void vcc_dir_initialize_defaults(void)
+static void vcc_dir_initialize_defaults(void)
 {
 	b_defaults.port = NULL;
 	b_defaults.hostheader = NULL;
@@ -80,10 +72,11 @@ void vcc_dir_initialize_defaults(void)
 	b_defaults.saint = UINT_MAX;
 }
 
-struct token *dns_first;
-void
+static struct token *dns_first;
+
+static void
 print_backend(struct vcc *tl,
-	      uint32_t serial,
+	      int serial,
 	      uint8_t *ip)
 {
 	char vgcname[BUFSIZ];
@@ -92,12 +85,12 @@ print_backend(struct vcc *tl,
 	struct vsb *vsb;
 	sprintf(strip, "%d.%d.%d.%d",ip[3],ip[2],ip[1],ip[0]);
 	tmptok.dec = strip;
-	sprintf(vgcname,"%.*s_%u",PF(tl->t_dir),serial);
+	sprintf(vgcname,"%.*s_%d",PF(tl->t_dir),serial);
 	vsb = vsb_newauto();
 	AN(vsb);
 	tl->fb = vsb;
 	Fc(tl, 0, "\t{ .host = VGC_backend_%s },\n",vgcname);
-	Fh(tl, 1, "\n#define VGC_backend_%s %u\n", vgcname, serial);
+	Fh(tl, 1, "\n#define VGC_backend_%s %d\n", vgcname, serial);
 
 	Fb(tl, 0, "\nstatic const struct vrt_backend vgc_dir_priv_%s = {\n", vgcname);
 
@@ -142,9 +135,9 @@ print_backend(struct vcc *tl,
  * This assumes that a uint32_t can be safely accessed as an array of 4
  * uint8_ts.
  */
-void
+static void
 vcc_dir_dns_makebackend(struct vcc *tl, 
-			uint32_t *serial,
+			int *serial,
 			unsigned char a[],
 			int inmask)
 {
@@ -172,7 +165,8 @@ vcc_dir_dns_makebackend(struct vcc *tl,
 		ip4++;
 	}
 }
-void
+
+static void
 vcc_dir_dns_parse_backend_options(struct vcc *tl)
 {
 	struct fld_spec *fs;
@@ -253,18 +247,18 @@ vcc_dir_dns_parse_backend_options(struct vcc *tl)
 /* Parse a list of backends with optional /mask notation, then print out
  * all relevant backends.
  */
-void
+static void
 vcc_dir_dns_parse_list(struct vcc *tl, int *serial)
 {
 	unsigned char a[4],mask;
-	int ret, nitem;
+	int ret;
 	ERRCHK(tl);
 	SkipToken(tl, '{');
 	if (tl->t->tok != CSTR)
 		vcc_dir_dns_parse_backend_options(tl);
 	while (tl->t->tok == CSTR) {
 		mask = 32;
-		ret = sscanf(tl->t->dec, "%d.%d.%d.%d",&a[0],&a[1],&a[2],&a[3],&a[4]);
+		ret = sscanf(tl->t->dec, "%hhu.%hhu.%hhu.%hhu",&a[0],&a[1],&a[2],&a[3]);
 		assert(ret == 4);
 		vcc_NextToken(tl);
 		if (tl->t->tok == '/') {