Module Name: src Committed By: christos Date: Wed Mar 26 18:03:47 UTC 2014
Modified Files: src/sys/kern: subr_prf.c src/sys/sys: systm.h Log Message: remove {v,}sprintf To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/sys/kern/subr_prf.c cvs rdiff -u -r1.261 -r1.262 src/sys/sys/systm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/subr_prf.c diff -u src/sys/kern/subr_prf.c:1.152 src/sys/kern/subr_prf.c:1.153 --- src/sys/kern/subr_prf.c:1.152 Sat Jan 11 19:29:15 2014 +++ src/sys/kern/subr_prf.c Wed Mar 26 14:03:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_prf.c,v 1.152 2014/01/12 00:29:15 joerg Exp $ */ +/* $NetBSD: subr_prf.c,v 1.153 2014/03/26 18:03:47 christos Exp $ */ /*- * Copyright (c) 1986, 1988, 1991, 1993 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.152 2014/01/12 00:29:15 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.153 2014/03/26 18:03:47 christos Exp $"); #include "opt_ddb.h" #include "opt_ipkdb.h" @@ -995,38 +995,6 @@ vprintf(const char *fmt, va_list ap) } /* - * sprintf: print a message to a buffer - */ -int -sprintf(char *bf, const char *fmt, ...) -{ - int retval; - va_list ap; - - va_start(ap, fmt); - retval = kprintf(fmt, TOBUFONLY, NULL, bf, ap); - va_end(ap); - if (bf) - bf[retval] = '\0'; /* nul terminate */ - return retval; -} - -/* - * vsprintf: print a message to a buffer [already have va_list] - */ - -int -vsprintf(char *bf, const char *fmt, va_list ap) -{ - int retval; - - retval = kprintf(fmt, TOBUFONLY, NULL, bf, ap); - if (bf) - bf[retval] = '\0'; /* nul terminate */ - return retval; -} - -/* * snprintf: print a message to a buffer */ int Index: src/sys/sys/systm.h diff -u src/sys/sys/systm.h:1.261 src/sys/sys/systm.h:1.262 --- src/sys/sys/systm.h:1.261 Mon Mar 24 16:07:40 2014 +++ src/sys/sys/systm.h Wed Mar 26 14:03:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: systm.h,v 1.261 2014/03/24 20:07:40 christos Exp $ */ +/* $NetBSD: systm.h,v 1.262 2014/03/26 18:03:47 christos Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -214,14 +214,10 @@ void printf_nolog(const char *, ...) __p void printf(const char *, ...) __printflike(1, 2); -int sprintf(char *, const char *, ...) __printflike(2, 3); - int snprintf(char *, size_t, const char *, ...) __printflike(3, 4); void vprintf(const char *, va_list) __printflike(1, 0); -int vsprintf(char *, const char *, va_list) __printflike(2, 0); - int vsnprintf(char *, size_t, const char *, va_list) __printflike(3, 0); int humanize_number(char *, size_t, uint64_t, const char *, int);