Module Name: src
Committed By: christos
Date: Wed Mar 26 16:16:06 UTC 2014
Modified Files:
src/sys/arch/sgimips/mace: pci_mace.c
src/sys/arch/sgimips/sgimips: arcemu.c
src/sys/arch/sgimips/stand/common: boot.c
src/sys/arch/sgimips/stand/sgivol: sgivol.c
Log Message:
kill sprintf.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/mace/pci_mace.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/sgimips/arcemu.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/stand/common/boot.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/stand/sgivol/sgivol.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/sgimips/mace/pci_mace.c
diff -u src/sys/arch/sgimips/mace/pci_mace.c:1.15 src/sys/arch/sgimips/mace/pci_mace.c:1.16
--- src/sys/arch/sgimips/mace/pci_mace.c:1.15 Sat Oct 27 13:18:10 2012
+++ src/sys/arch/sgimips/mace/pci_mace.c Wed Mar 26 12:16:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_mace.c,v 1.15 2012/10/27 17:18:10 chs Exp $ */
+/* $NetBSD: pci_mace.c,v 1.16 2014/03/26 16:16:06 christos Exp $ */
/*
* Copyright (c) 2001,2003 Christopher Sekiya
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.15 2012/10/27 17:18:10 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.16 2014/03/26 16:16:06 christos Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -252,7 +252,7 @@ macepci_intr_string(pci_chipset_tag_t pc
{
static char irqstr[32];
- sprintf(irqstr, "crime interrupt %d", ih);
+ snprintf(irqstr, sizeof(irqstr), "crime interrupt %d", ih);
return irqstr;
}
Index: src/sys/arch/sgimips/sgimips/arcemu.c
diff -u src/sys/arch/sgimips/sgimips/arcemu.c:1.21 src/sys/arch/sgimips/sgimips/arcemu.c:1.22
--- src/sys/arch/sgimips/sgimips/arcemu.c:1.21 Fri Jul 1 14:54:32 2011
+++ src/sys/arch/sgimips/sgimips/arcemu.c Wed Mar 26 12:16:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: arcemu.c,v 1.21 2011/07/01 18:54:32 dyoung Exp $ */
+/* $NetBSD: arcemu.c,v 1.22 2014/03/26 16:16:06 christos Exp $ */
/*
* Copyright (c) 2004 Steve Rumble
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcemu.c,v 1.21 2011/07/01 18:54:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcemu.c,v 1.22 2014/03/26 16:16:06 christos Exp $");
#ifndef _LP64
@@ -298,7 +298,7 @@ arcemu_eeprom_read(void)
}
/* cache enaddr string */
- sprintf(enaddr, "%02x:%02x:%02x:%02x:%02x:%02x",
+ snprintf(enaddr, sizeof(enaddr), "%02x:%02x:%02x:%02x:%02x:%02x",
nvram.enaddr[0],
nvram.enaddr[1],
nvram.enaddr[2],
Index: src/sys/arch/sgimips/stand/common/boot.c
diff -u src/sys/arch/sgimips/stand/common/boot.c:1.19 src/sys/arch/sgimips/stand/common/boot.c:1.20
--- src/sys/arch/sgimips/stand/common/boot.c:1.19 Sun Feb 20 02:59:52 2011
+++ src/sys/arch/sgimips/stand/common/boot.c Wed Mar 26 12:16:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.19 2011/02/20 07:59:52 matt Exp $ */
+/* $NetBSD: boot.c,v 1.20 2014/03/26 16:16:06 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -160,14 +160,16 @@ main(int argc, char **argv)
*/
if (strstr(argv[0], "cdrom(")) {
+ char *ep =
strcpy(bootfile, argv[0]);
- i = (strrchr(bootfile, ')') - bootfile);
+ ep = strrchr(bootfile, ')');
+ i = ep - bootfile;
bootfile[i - 1] = '0';
if (strstr(bootfile, "ip3x"))
kernel = "ip3x";
else
kernel = "ip2x";
- sprintf((strrchr(bootfile, ')') + 1), kernel);
+ strcpy(ep + 1, kernel);
if ((loadfile(bootfile, marks, LOAD_KERNEL)) >= 0)
goto finish;
}
Index: src/sys/arch/sgimips/stand/sgivol/sgivol.c
diff -u src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.19 src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.20
--- src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.19 Thu Jun 27 17:24:08 2013
+++ src/sys/arch/sgimips/stand/sgivol/sgivol.c Wed Mar 26 12:16:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sgivol.c,v 1.19 2013/06/27 21:24:08 christos Exp $ */
+/* $NetBSD: sgivol.c,v 1.20 2014/03/26 16:16:06 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -206,7 +206,8 @@ main(int argc, char *argv[])
perror("File open");
exit(1);
#else
- sprintf((char *)buf, "/dev/r%s%c", argv[0], 'a' + getrawpartition());
+ snprintf(buf, sizeof(buf), "/dev/r%s%c", argv[0],
+ 'a' + getrawpartition());
fd = open((char *)buf, (opt_i | opt_w | opt_d | opt_p)
? O_RDWR : O_RDONLY);
if (fd < 0) {
