Add format attributes to the proper functions and then fix the warnings

that gcc then reports when compiling with -DDEBUG=2

ok reyk@ benno@

7 files changed, 25 insertions, 24 deletions

diff --git a/usr.sbin/relayd/carp.c b/usr.sbin/relayd/carp.c
index c9d9c95e011..536fed2d709 100644
--- a/usr.sbin/relayd/carp.c
+++ b/usr.sbin/relayd/carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: carp.c,v 1.8 2011/05/05 12:01:43 reyk Exp $ */
+/*	$OpenBSD: carp.c,v 1.9 2012/11/27 05:00:28 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -69,7 +69,7 @@ carp_demote_init(char *group, int force)
 			return (-1);
 		}
 		if ((c->group = strdup(group)) == NULL) {
-			log_warn("%s: strdup, __func__");
+			log_warn("%s: strdup", __func__);
 			free(c);
 			return (-1);
 		}
diff --git a/usr.sbin/relayd/config.c b/usr.sbin/relayd/config.c
index 5874d17e27e..0fc003779f4 100644
--- a/usr.sbin/relayd/config.c
+++ b/usr.sbin/relayd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.6 2012/10/04 20:53:30 reyk Exp $	*/
+/*	$OpenBSD: config.c,v 1.7 2012/11/27 05:00:28 guenther Exp $	*/
 
 /*
  * Copyright (c) 2011 Reyk Floeter <reyk@openbsd.org>
@@ -785,7 +785,7 @@ config_getprotonode(struct relayd *env, struct imsg *imsg)
 	if (!c)
 		return (0);
 
-	DPRINTF("%s: %s %d received %d nodes for protocol %s", __func__,
+	DPRINTF("%s: %s %d received %lu nodes for protocol %s", __func__,
 	    env->sc_ps->ps_title[privsep_process], env->sc_ps->ps_instance,
 	    c, proto->name);
 
diff --git a/usr.sbin/relayd/log.c b/usr.sbin/relayd/log.c
index e9cf0019cfc..da5a2fb2fa6 100644
--- a/usr.sbin/relayd/log.c
+++ b/usr.sbin/relayd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.17 2011/04/12 12:37:22 reyk Exp $	*/
+/*	$OpenBSD: log.c,v 1.18 2012/11/27 05:00:28 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -44,8 +44,10 @@
 int	 debug;
 int	 verbose;
 
-void	 vlog(int, const char *, va_list);
-void	 logit(int, const char *, ...);
+void	 vlog(int, const char *, va_list)
+	    __attribute__((__format__ (printf, 2, 0)));
+void	 logit(int, const char *, ...)
+	    __attribute__((__format__ (printf, 2, 3)));
 
 void
 log_init(int n_debug)
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c
index 72729c3c279..865c1add138 100644
--- a/usr.sbin/relayd/relay.c
+++ b/usr.sbin/relayd/relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.157 2012/10/19 16:49:50 reyk Exp $	*/
+/*	$OpenBSD: relay.c,v 1.158 2012/11/27 05:00:28 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2012 Reyk Floeter <reyk@openbsd.org>
@@ -940,7 +940,7 @@ relay_accept(int fd, short event, void *arg)
 
 	slen = sizeof(ss);
 	if ((s = accept_reserve(fd, (struct sockaddr *)&ss,
-	    (socklen_t *)&slen, FD_RESERVE, &relay_inflight)) == -1) {
+	    &slen, FD_RESERVE, &relay_inflight)) == -1) {
 		/*
 		 * Pause accept if we are out of file descriptors, or
 		 * libevent will haunt us here too.
@@ -950,8 +950,7 @@ relay_accept(int fd, short event, void *arg)
 
 			event_del(&rlay->rl_ev);
 			evtimer_add(&rlay->rl_evt, &evtpause);
-			log_debug("%s: deferring connections",__func__,
-			    relay_inflight);
+			log_debug("%s: deferring connections", __func__);
 		}
 		return;
 	}
diff --git a/usr.sbin/relayd/relay_http.c b/usr.sbin/relayd/relay_http.c
index c04a3e60039..f2abf7d2e8c 100644
--- a/usr.sbin/relayd/relay_http.c
+++ b/usr.sbin/relayd/relay_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_http.c,v 1.4 2012/11/21 22:14:24 benno Exp $	*/
+/*	$OpenBSD: relay_http.c,v 1.5 2012/11/27 05:00:28 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2012 Reyk Floeter <reyk@openbsd.org>
@@ -81,7 +81,7 @@ relay_read_http(struct bufferevent *bev, void *arg)
 	if (gettimeofday(&con->se_tv_last, NULL) == -1)
 		goto fail;
 	size = EVBUFFER_LENGTH(src);
-	DPRINTF("%s: size %lu, to read %ll", __func__, size, cre->toread);
+	DPRINTF("%s: size %lu, to read %lld", __func__, size, cre->toread);
 	if (!size) {
 		if (cre->dir == RELAY_DIR_RESPONSE)
 			return;
@@ -390,7 +390,7 @@ relay_read_httpcontent(struct bufferevent *bev, void *arg)
 	if (gettimeofday(&con->se_tv_last, NULL) == -1)
 		goto fail;
 	size = EVBUFFER_LENGTH(src);
-	DPRINTF("%s: size %lu, to read %ll", __func__,
+	DPRINTF("%s: size %lu, to read %lld", __func__,
 	    size, cre->toread);
 	if (!size)
 		return;
@@ -399,7 +399,7 @@ relay_read_httpcontent(struct bufferevent *bev, void *arg)
 	if ((off_t)size >= cre->toread)
 		bev->readcb = relay_read_http;
 	cre->toread -= size;
-	DPRINTF("%s: done, size %lu, to read %ll", __func__,
+	DPRINTF("%s: done, size %lu, to read %lld", __func__,
 	    size, cre->toread);
 	if (con->se_done)
 		goto done;
@@ -427,7 +427,7 @@ relay_read_httpchunks(struct bufferevent *bev, void *arg)
 	if (gettimeofday(&con->se_tv_last, NULL) == -1)
 		goto fail;
 	size = EVBUFFER_LENGTH(src);
-	DPRINTF("%s: size %lu, to read %ll", __func__,
+	DPRINTF("%s: size %lu, to read %lld", __func__,
 	    size, cre->toread);
 	if (!size)
 		return;
@@ -481,7 +481,7 @@ relay_read_httpchunks(struct bufferevent *bev, void *arg)
 		if (relay_bufferevent_write_chunk(cre->dst, src, size) == -1)
 			goto fail;
 		cre->toread -= size;
-		DPRINTF("%s: done, size %lu, to read %ll", __func__,
+		DPRINTF("%s: done, size %lu, to read %lld", __func__,
 		    size, cre->toread);
 
 		if (cre->toread == 0) {
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index b516a77f26b..8ab976ab60a 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.111 2012/10/03 08:46:05 reyk Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.112 2012/11/27 05:00:28 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -1184,7 +1184,7 @@ socket_rlimit(int maxfd)
 
 	if (getrlimit(RLIMIT_NOFILE, &rl) == -1)
 		fatal("socket_rlimit: failed to get resource limit");
-	log_debug("%s: max open files %d", __func__, rl.rlim_max);
+	log_debug("%s: max open files %llu", __func__, rl.rlim_max);
 
 	/*
 	 * Allow the maximum number of open file descriptors for this
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h
index 3ef3f6cfafa..3a20f85ae72 100644
--- a/usr.sbin/relayd/relayd.h
+++ b/usr.sbin/relayd/relayd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.h,v 1.162 2012/10/19 16:49:50 reyk Exp $	*/
+/*	$OpenBSD: relayd.h,v 1.163 2012/11/27 05:00:28 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2012 Reyk Floeter <reyk@openbsd.org>
@@ -1112,10 +1112,10 @@ u_int16_t	shuffle_generate16(struct shuffle *);
 /* log.c */
 void	log_init(int);
 void	log_verbose(int);
-void	log_warn(const char *, ...);
-void	log_warnx(const char *, ...);
-void	log_info(const char *, ...);
-void	log_debug(const char *, ...);
+void	log_warn(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
+void	log_warnx(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
+void	log_info(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
+void	log_debug(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
 __dead void fatal(const char *);
 __dead void fatalx(const char *);