Various nit-pickery necessary for OS/X

lib/libvarnishtools/vut.c

@@ -43,7 +43,6 @@
 #include "compat/daemon.h"
 #include "vpf.h"
 #include "vapi/vsm.h"
-#include "vapi/vsc.h"
 #include "vapi/vsl.h"
 #include "vtim.h"
 #include "vas.h"
@@ -256,7 +255,7 @@ VUT_Setup(void)
 	/* Write PID and setup exit handler */
 	if (VUT.pfh != NULL) {
 		VPF_Write(VUT.pfh);
-		AZ(atexit(&vut_vpf_remove));
+		AZ(atexit(vut_vpf_remove));
 	}
 }
 
@@ -286,7 +285,7 @@ int
 VUT_Main(VSLQ_dispatch_f *func, void *priv)
 {
 	struct VSL_cursor *c;
-	int i;
+	int i = -1;
 
 	AN(VUT.vslq);
 

lib/libvcc/vcc_utils.c

@@ -113,7 +113,8 @@ vcc_sockaddr(struct vcc *tl, const void *sa, unsigned sal)
 	memcpy(b, sua, vsa_suckaddr_len);
 	free(sua);
 	for (len = 0; len < n; len++)
-		Fh(tl, 0, "%s    0x%0*llx", len ? ",\n" : "", sz * 2, b[len]);
+		Fh(tl, 0, "%s    0x%0*llxLL",
+		    len ? ",\n" : "", sz * 2, b[len]);
 	Fh(tl, 0, "\n};\n");
 
 	p = TlAlloc(tl, 40);