From: Sascha Wildner Date: Thu, 20 Feb 2014 13:06:49 +0000 (+0100) Subject: Raise WARNS for a few things in usr.sbin and fix warnings. X-Git-Tag: v3.9.0~508 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/51798e10f3dd8a6acc6d22df5c189f54549b7714 Raise WARNS for a few things in usr.sbin and fix warnings. --- diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile index 141fc03118..bca88438cd 100644 --- a/usr.sbin/rpc.ypxfrd/Makefile +++ b/usr.sbin/rpc.ypxfrd/Makefile @@ -1,10 +1,9 @@ # $FreeBSD: src/usr.sbin/rpc.ypxfrd/Makefile,v 1.8.2.1 2001/04/25 12:10:47 ru Exp $ -# $DragonFly: src/usr.sbin/rpc.ypxfrd/Makefile,v 1.2 2003/06/17 04:30:02 dillon Exp $ PROG= rpc.ypxfrd SRCS= ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \ yp_access.c ypxfrd_main.c -WARNS?= 1 +WARNS?= 2 RPCDIR= ${.CURDIR}/../../include/rpcsvc diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile index 74bec589aa..84d370160b 100644 --- a/usr.sbin/yp_mkdb/Makefile +++ b/usr.sbin/yp_mkdb/Makefile @@ -1,9 +1,8 @@ # $FreeBSD: src/usr.sbin/yp_mkdb/Makefile,v 1.5.2.1 2001/04/25 12:11:13 ru Exp $ -# $DragonFly: src/usr.sbin/yp_mkdb/Makefile,v 1.2 2003/06/17 04:30:04 dillon Exp $ PROG= yp_mkdb SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c -WARNS?= 1 +WARNS?= 3 MAN= yp_mkdb.8 diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c index 3b27a421df..c37fbe513c 100644 --- a/usr.sbin/yp_mkdb/yp_mkdb.c +++ b/usr.sbin/yp_mkdb/yp_mkdb.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.c,v 1.12.2.1 2002/02/15 00:46:59 des Exp $ - * $DragonFly: src/usr.sbin/yp_mkdb/yp_mkdb.c,v 1.4 2005/11/24 22:23:02 swildner Exp $ */ #include @@ -87,7 +86,8 @@ unwind(char *map) key.data = NULL; while (yp_next_record(dbp, &key, &data, 1, 1) == YP_TRUE) - printf("%.*s %.*s\n", key.size,key.data,data.size,data.data); + printf("%.*s %.*s\n", (int)key.size, (char *)key.data, + (int)data.size, (char *)data.data); dbp->close(dbp); return; diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile index 88aec973f0..55eeeec953 100644 --- a/usr.sbin/yppush/Makefile +++ b/usr.sbin/yppush/Makefile @@ -1,5 +1,4 @@ # $FreeBSD: src/usr.sbin/yppush/Makefile,v 1.9 2001/07/20 06:20:30 obrien Exp $ -# $DragonFly: src/usr.sbin/yppush/Makefile,v 1.2 2003/06/17 04:30:04 dillon Exp $ RPCDIR= ${.CURDIR}/../../include/rpcsvc .PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \ @@ -10,7 +9,7 @@ MAN= yppush.8 SRCS= ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \ ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppush_svc.c -WARNS?= 1 +WARNS?= 3 CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c index 4b5264007d..f4637f2f89 100644 --- a/usr.sbin/yppush/yppush_main.c +++ b/usr.sbin/yppush/yppush_main.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.22 2006/08/16 12:58:41 thomas Exp $ - * $DragonFly: src/usr.sbin/yppush/yppush_main.c,v 1.3 2005/11/24 22:23:02 swildner Exp $ */ #include @@ -137,11 +136,11 @@ yppush_show_status(ypxfrstat status, unsigned long tid) job->tid); } - if (status != YPPUSH_SUCC || verbose) { + if (status != YPXFR_SUCC || verbose) { yp_error("transfer of map %s to server %s %s", - job->map, job->server, status == YPPUSH_SUCC ? + job->map, job->server, status == YPXFR_SUCC ? "succeeded" : "failed"); - yp_error("status returned by ypxfr: %s", status > YPPUSH_AGE ? + yp_error("status returned by ypxfr: %s", status > YPXFR_AGE ? yppusherr_string(status) : ypxfrerr_string(status)); } @@ -365,7 +364,7 @@ create udp handle to NIS server")); * request to the internal list, send the YPPROC_XFR request to ypserv * do other magic things. */ -int +static int yp_push(char *server, char *map, unsigned long tid) { unsigned long prognum; @@ -433,7 +432,7 @@ yp_push(char *server, char *map, unsigned long tid) * Called for each entry in the ypservers map from yp_get_map(), which * is our private yp_all() routine. */ -int +static int yppush_foreach(int status, char *key, int keylen, char *val, int vallen, char *data) { @@ -488,7 +487,6 @@ main(int argc, char *argv[]) }; struct hostlist *yppush_hostlist = NULL; struct hostlist *tmp; - struct sigaction sa; while ((ch = getopt(argc, argv, "d:j:p:h:t:v")) != -1) { switch (ch) { diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index 1e80cd57be..b2187ed8c5 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -1,5 +1,4 @@ # $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.24 2004/10/18 21:42:15 ru Exp $ -# $DragonFly: src/usr.sbin/ypserv/Makefile,v 1.3 2005/07/07 11:49:57 corecode Exp $ RPCDIR= ${.CURDIR}/../../include/rpcsvc .PATH: ${RPCDIR} @@ -8,7 +7,7 @@ PROG= ypserv MAN= ypserv.8 ypinit.8 SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c -WARNS?= 1 +WARNS?= 2 CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I. diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c index 6c94479cb5..31e9badbb3 100644 --- a/usr.sbin/ypserv/yp_dnslookup.c +++ b/usr.sbin/ypserv/yp_dnslookup.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/ypserv/yp_dnslookup.c,v 1.27 2005/05/20 13:04:10 charnier Exp $ - * $DragonFly: src/usr.sbin/ypserv/yp_dnslookup.c,v 1.4 2005/11/24 22:23:02 swildner Exp $ */ /* @@ -456,7 +455,7 @@ yp_async_lookup_name(struct svc_req *rqstp, char *name, int af) pending++; if (debug) - yp_error("queueing async DNS name lookup (%d)", q->id); + yp_error("queueing async DNS name lookup (%lu)", q->id); yp_prune_dnsq(); return(YP_TRUE); @@ -544,7 +543,7 @@ yp_async_lookup_addr(struct svc_req *rqstp, char *addr, int af) pending++; if (debug) - yp_error("queueing async DNS address lookup (%d)", q->id); + yp_error("queueing async DNS address lookup (%lu)", q->id); yp_prune_dnsq(); return(YP_TRUE);