diff options
| -rw-r--r-- | usr.bin/mg/undo.c | 4 | ||||
| -rw-r--r-- | usr.bin/oldrdist/server.c | 6 | ||||
| -rw-r--r-- | usr.bin/rpcgen/rpc_svcout.c | 4 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c | 2 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/lib/file.c | 8 | ||||
| -rw-r--r-- | usr.sbin/rarpd/rarpd.c | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/usr.bin/mg/undo.c b/usr.bin/mg/undo.c index 2f9485e81db..c25d351608c 100644 --- a/usr.bin/mg/undo.c +++ b/usr.bin/mg/undo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: undo.c,v 1.16 2003/05/20 03:08:55 cloder Exp $ */ +/* $OpenBSD: undo.c,v 1.17 2003/06/01 15:53:34 deraadt Exp $ */ /* * Copyright (c) 2002 Vincent Labrecque * All rights reserved. @@ -403,7 +403,7 @@ undo_dump(void) } snprintf(tmp, sizeof tmp, " [%d]", rec->region.r_size); strlcat(buf, tmp, sizeof buf); - addlinef(bp, buf); + addlinef(bp, "%s", buf); } return (TRUE); } diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c index c30785de140..b835d55f5a5 100644 --- a/usr.bin/oldrdist/server.c +++ b/usr.bin/oldrdist/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.22 2003/04/06 17:57:45 ho Exp $ */ +/* $OpenBSD: server.c,v 1.23 2003/06/01 15:53:35 deraadt Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,7 +35,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: server.c,v 1.22 2003/04/06 17:57:45 ho Exp $"; +static char *rcsid = "$OpenBSD: server.c,v 1.23 2003/06/01 15:53:35 deraadt Exp $"; #endif /* not lint */ #include <sys/wait.h> @@ -216,7 +216,7 @@ server() continue; case 'L': /* Log. save message in log file */ - log(lfp, cp); + log(lfp, "%s", cp); continue; #endif diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c index 274598200b1..efc0c888504 100644 --- a/usr.bin/rpcgen/rpc_svcout.c +++ b/usr.bin/rpcgen/rpc_svcout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_svcout.c,v 1.15 2002/07/05 05:39:42 deraadt Exp $ */ +/* $OpenBSD: rpc_svcout.c,v 1.16 2003/06/01 15:53:36 deraadt Exp $ */ /* $NetBSD: rpc_svcout.c,v 1.7 1995/06/24 14:59:59 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -306,7 +306,7 @@ write_real_program(def) fprintf(fout, "("); /* arg name */ if (proc->arg_num > 1) - fprintf(fout, proc->args.argname); + fprintf(fout, "%s", proc->args.argname); else ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 0); diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c index 13b1e513478..bd5da6e5a5f 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c @@ -524,7 +524,7 @@ static char *ssl_ext_mp_new_connection(request_rec *r, BUFF *fb, char *peer) #endif errmsg = ap_psprintf(r->pool, "SSL proxy connect failed (%s): peer %s: %s", cpVHostID, peer, ERR_reason_error_string(ERR_get_error())); - ssl_log(r->server, SSL_LOG_ERROR, errmsg); + ssl_log(r->server, SSL_LOG_ERROR, "%s", errmsg); SSL_free(ssl); ap_ctx_set(fb->ctx, "ssl", NULL); return errmsg; diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index 3da4179496d..b752c0419ad 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -1,7 +1,7 @@ -/* $OpenBSD: file.c,v 1.19 2003/05/12 22:03:22 pvalchev Exp $ */ +/* $OpenBSD: file.c,v 1.20 2003/06/01 15:53:43 deraadt Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: file.c,v 1.19 2003/05/12 22:03:22 pvalchev Exp $"; +static const char *rcsid = "$OpenBSD: file.c,v 1.20 2003/06/01 15:53:43 deraadt Exp $"; #endif /* @@ -521,7 +521,7 @@ copy_file(char *dir, char *fname, char *to) snprintf(cmd, FILENAME_MAX, "cp -p -r %s %s", fname, to); else snprintf(cmd, FILENAME_MAX, "cp -p -r %s/%s %s", dir, fname, to); - if (vsystem(cmd)) { + if (vsystem("%s", cmd)) { cleanup(0); errx(2, "could not perform '%s'", cmd); } @@ -536,7 +536,7 @@ move_file(char *dir, char *fname, char *to) snprintf(cmd, FILENAME_MAX, "mv %s %s", fname, to); else snprintf(cmd, FILENAME_MAX, "mv %s/%s %s", dir, fname, to); - if (vsystem(cmd)) { + if (vsystem("%s", cmd)) { cleanup(0); errx(2, "could not perform '%s'", cmd); } diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 3438da22938..48a6e138cc9 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rarpd.c,v 1.38 2003/05/15 14:52:12 itojun Exp $ */ +/* $OpenBSD: rarpd.c,v 1.39 2003/06/01 15:53:43 deraadt Exp $ */ /* $NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $ */ /* @@ -28,7 +28,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: rarpd.c,v 1.38 2003/05/15 14:52:12 itojun Exp $"; +static char rcsid[] = "$OpenBSD: rarpd.c,v 1.39 2003/06/01 15:53:43 deraadt Exp $"; #endif @@ -551,7 +551,7 @@ rarp_process(struct if_info *ii, u_char *pkt) ep = (struct ether_header *) pkt; ea = (struct ether_addr *) &ep->ether_shost; - debug(ether_ntoa(ea)); + debug("%s", ether_ntoa(ea)); if (ether_ntohost(ename, ea) != 0) { debug("ether_ntohost failed"); return; |