Module Name: src Committed By: christos Date: Wed Mar 26 17:42:00 UTC 2014
Modified Files: src/sys/arch/mips/alchemy/dev: aupci.c src/sys/arch/mips/mips: trap.c src/sys/arch/mips/ralink: ralink_mainbus.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/alchemy/dev/aupci.c cvs rdiff -u -r1.235 -r1.236 src/sys/arch/mips/mips/trap.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ralink/ralink_mainbus.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/mips/alchemy/dev/aupci.c diff -u src/sys/arch/mips/alchemy/dev/aupci.c:1.13 src/sys/arch/mips/alchemy/dev/aupci.c:1.14 --- src/sys/arch/mips/alchemy/dev/aupci.c:1.13 Fri Jan 27 13:52:58 2012 +++ src/sys/arch/mips/alchemy/dev/aupci.c Wed Mar 26 13:42:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: aupci.c,v 1.13 2012/01/27 18:52:58 para Exp $ */ +/* $NetBSD: aupci.c,v 1.14 2014/03/26 17:42:00 christos Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -35,7 +35,7 @@ #include "pci.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.13 2012/01/27 18:52:58 para Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.14 2014/03/26 17:42:00 christos Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -400,7 +400,7 @@ aupci_intr_string(void *v, pci_intr_hand { static char name[16]; - sprintf(name, "irq %u", (unsigned)ih); + snprintf(name, sizeof(name), "irq %u", (unsigned)ih); return (name); } Index: src/sys/arch/mips/mips/trap.c diff -u src/sys/arch/mips/mips/trap.c:1.235 src/sys/arch/mips/mips/trap.c:1.236 --- src/sys/arch/mips/mips/trap.c:1.235 Sun Feb 19 16:06:20 2012 +++ src/sys/arch/mips/mips/trap.c Wed Mar 26 13:42:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.235 2012/02/19 21:06:20 rmind Exp $ */ +/* $NetBSD: trap.c,v 1.236 2014/03/26 17:42:00 christos Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.235 2012/02/19 21:06:20 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.236 2014/03/26 17:42:00 christos Exp $"); #include "opt_cputype.h" /* which mips CPU levels do we support? */ #include "opt_ddb.h" @@ -1192,7 +1192,7 @@ fn_name(vaddr_t addr) for (i = 0; names[i].name; i++) if (names[i].addr == (void*)addr) return (names[i].name); - sprintf(buf, "%#"PRIxVADDR, addr); + snprintf(buf, sizeof(buf), "%#"PRIxVADDR, addr); return (buf); } Index: src/sys/arch/mips/ralink/ralink_mainbus.c diff -u src/sys/arch/mips/ralink/ralink_mainbus.c:1.2 src/sys/arch/mips/ralink/ralink_mainbus.c:1.3 --- src/sys/arch/mips/ralink/ralink_mainbus.c:1.2 Thu Jul 28 11:38:49 2011 +++ src/sys/arch/mips/ralink/ralink_mainbus.c Wed Mar 26 13:42:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ralink_mainbus.c,v 1.2 2011/07/28 15:38:49 matt Exp $ */ +/* $NetBSD: ralink_mainbus.c,v 1.3 2014/03/26 17:42:00 christos Exp $ */ /*- * Copyright (c) 2011 CradlePoint Technology, Inc. * All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.2 2011/07/28 15:38:49 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.3 2014/03/26 17:42:00 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -129,7 +129,7 @@ mainbus_find(device_t parent, cfdata_t c struct mainbus_attach_args * const ma = aux; char devname[16]; - sprintf(devname, "%s%d", cf->cf_name, cf->cf_unit); + snprintf(devname, sizeof(devname), "%s%d", cf->cf_name, cf->cf_unit); if (strcmp(ma->ma_name, devname) != 0) return 0;