diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-01 15:53:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-01 15:53:44 +0000 |
| commit | c1b5e4353daf6f1929dad2fc6e04853b6ee139ae (patch) | |
| tree | 797bc454bacbb174ba9c864e6e5782aa4eca9c9d /usr.sbin | |
| parent | 345cf55c40f7beff8ab2f9db25c315c38d34bfd6 (diff) | |
various format string cleanups; tedu ok
Diffstat (limited to 'usr.sbin')
| -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 |
3 files changed, 8 insertions, 8 deletions
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; |