Module Name: src
Committed By: christos
Date: Fri Mar 21 16:43:00 UTC 2014
Modified Files:
src/sys/arch/acorn32/podulebus: csa.c podulebus.c
src/sys/arch/acorn32/stand/boot32: boot32.c
src/sys/arch/acorn32/stand/nbfs: nbfs.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn32/podulebus/csa.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn32/podulebus/podulebus.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/acorn32/stand/boot32/boot32.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn32/stand/nbfs/nbfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/podulebus/csa.c
diff -u src/sys/arch/acorn32/podulebus/csa.c:1.11 src/sys/arch/acorn32/podulebus/csa.c:1.12
--- src/sys/arch/acorn32/podulebus/csa.c:1.11 Sat Oct 27 13:17:23 2012
+++ src/sys/arch/acorn32/podulebus/csa.c Fri Mar 21 12:43:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: csa.c,v 1.11 2012/10/27 17:17:23 chs Exp $ */
+/* $NetBSD: csa.c,v 1.12 2014/03/21 16:43:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: csa.c,v 1.11 2012/10/27 17:17:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: csa.c,v 1.12 2014/03/21 16:43:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,7 +184,7 @@ csa_attach(device_t parent, device_t sel
/* Provide an override for the host id */
ncr_sc->sc_channel.chan_id = 7;
- sprintf(hi_option, "%s.hostid", device_xname(self));
+ snprintf(hi_option, sizeof(hi_option), "%s.hostid", device_xname(self));
(void)get_bootconf_option(boot_args, hi_option,
BOOTOPT_TYPE_INT, &ncr_sc->sc_channel.chan_id);
ncr_sc->sc_adapter.adapt_minphys = minphys;
Index: src/sys/arch/acorn32/podulebus/podulebus.c
diff -u src/sys/arch/acorn32/podulebus/podulebus.c:1.26 src/sys/arch/acorn32/podulebus/podulebus.c:1.27
--- src/sys/arch/acorn32/podulebus/podulebus.c:1.26 Fri Jun 3 03:35:37 2011
+++ src/sys/arch/acorn32/podulebus/podulebus.c Fri Mar 21 12:43:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.26 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: podulebus.c,v 1.27 2014/03/21 16:43:00 christos Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.26 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.27 2014/03/21 16:43:00 christos Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -461,7 +461,7 @@ podulebusattach(device_t parent, device_
for (loop = 0; loop < MAX_PODULES+MAX_NETSLOTS; ++loop) {
#if 1
/* Provide backwards compat for a while */
- sprintf(argstring, "podule%d.disable", loop);
+ snprintf(argstring, sizeof(argstring), "podule%d.disable", loop);
if (get_bootconf_option(boot_args, argstring,
BOOTOPT_TYPE_BOOLEAN, &value)) {
if (value) {
@@ -471,7 +471,7 @@ podulebusattach(device_t parent, device_
}
}
#endif
- sprintf(argstring, "podule%d=", loop);
+ snprintf(argstring, sizeof(argstring), "podule%d=", loop);
if (get_bootconf_option(boot_args, argstring,
BOOTOPT_TYPE_HEXINT, &value)) {
/* Override the ID */
Index: src/sys/arch/acorn32/stand/boot32/boot32.c
diff -u src/sys/arch/acorn32/stand/boot32/boot32.c:1.40 src/sys/arch/acorn32/stand/boot32/boot32.c:1.41
--- src/sys/arch/acorn32/stand/boot32/boot32.c:1.40 Mon Nov 4 16:08:14 2013
+++ src/sys/arch/acorn32/stand/boot32/boot32.c Fri Mar 21 12:43:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot32.c,v 1.40 2013/11/04 21:08:14 christos Exp $ */
+/* $NetBSD: boot32.c,v 1.41 2014/03/21 16:43:00 christos Exp $ */
/*-
* Copyright (c) 2002 Reinoud Zandijk
@@ -1058,7 +1058,7 @@ sprint0(int width, char prefix, char bas
*pos++ = base;
*pos++ = (char) 0;
- sprintf(scrap, format, value);
+ snprintf(scrap, sizeof(scrap), format, value);
length = strlen(scrap);
return scrap+length-width;
Index: src/sys/arch/acorn32/stand/nbfs/nbfs.c
diff -u src/sys/arch/acorn32/stand/nbfs/nbfs.c:1.10 src/sys/arch/acorn32/stand/nbfs/nbfs.c:1.11
--- src/sys/arch/acorn32/stand/nbfs/nbfs.c:1.10 Sun Jun 9 22:21:10 2013
+++ src/sys/arch/acorn32/stand/nbfs/nbfs.c Fri Mar 21 12:43:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nbfs.c,v 1.10 2013/06/10 02:21:10 mrg Exp $ */
+/* $NetBSD: nbfs.c,v 1.11 2014/03/21 16:43:00 christos Exp $ */
/*-
* Copyright (c) 2006 Ben Harris
@@ -449,7 +449,8 @@ nbfs_func(struct nbfs_reg *r)
case 16: /* Shut down */
return NULL;
default:
- sprintf(error.errmess, "nbfs_func %d not implemented", reason);
+ snprintf(error.errmess, sizeof(error.errmess),
+ "nbfs_func %d not implemented", reason);
return &error;
}
}
