Module Name: src
Committed By: christos
Date: Wed Mar 26 15:55:44 UTC 2014
Modified Files:
src/sys/arch/sparc/sparc: cpu.c pci_machdep.c promlib.c
src/sys/arch/sparc/stand/common: mmu.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/pci_machdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc/sparc/promlib.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/common/mmu.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/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.241 src/sys/arch/sparc/sparc/cpu.c:1.242
--- src/sys/arch/sparc/sparc/cpu.c:1.241 Mon Mar 24 16:06:32 2014
+++ src/sys/arch/sparc/sparc/cpu.c Wed Mar 26 11:55:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.241 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.242 2014/03/26 15:55:43 christos Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.241 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.242 2014/03/26 15:55:43 christos Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -954,7 +954,8 @@ fpu_init(struct cpu_info *sc)
sc->fpupresent = 1;
sc->fpu_name = fsrtoname(sc->cpu_impl, sc->cpu_vers, fpuvers);
if (sc->fpu_name == NULL) {
- sprintf(sc->fpu_namebuf, "version 0x%x", fpuvers);
+ snprintf(sc->fpu_namebuf, sizeof(sc->fpu_namebuf),
+ "version 0x%x", fpuvers);
sc->fpu_name = sc->fpu_namebuf;
}
}
Index: src/sys/arch/sparc/sparc/pci_machdep.c
diff -u src/sys/arch/sparc/sparc/pci_machdep.c:1.18 src/sys/arch/sparc/sparc/pci_machdep.c:1.19
--- src/sys/arch/sparc/sparc/pci_machdep.c:1.18 Tue Apr 16 02:57:06 2013
+++ src/sys/arch/sparc/sparc/pci_machdep.c Wed Mar 26 11:55:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.18 2013/04/16 06:57:06 jdc Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.19 2014/03/26 15:55:43 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.18 2013/04/16 06:57:06 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.19 2014/03/26 15:55:43 christos Exp $");
#if defined(DEBUG) && !defined(SPARC_PCI_DEBUG)
#define SPARC_PCI_DEBUG
@@ -496,7 +496,7 @@ pci_intr_string(pci_chipset_tag_t pc, pc
int pil;
pil = mspcic_assigned_interrupt(ih);
- sprintf(str, "line %d (pil %d)", ih, pil);
+ snprintf(str, sizeof(str), "line %d (pil %d)", ih, pil);
return str;
}
Index: src/sys/arch/sparc/sparc/promlib.c
diff -u src/sys/arch/sparc/sparc/promlib.c:1.43 src/sys/arch/sparc/sparc/promlib.c:1.44
--- src/sys/arch/sparc/sparc/promlib.c:1.43 Sun Jul 17 16:54:47 2011
+++ src/sys/arch/sparc/sparc/promlib.c Wed Mar 26 11:55:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: promlib.c,v 1.43 2011/07/17 20:54:47 joerg Exp $ */
+/* $NetBSD: promlib.c,v 1.44 2014/03/26 15:55:43 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.43 2011/07/17 20:54:47 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.44 2014/03/26 15:55:43 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sparc_arch.h"
@@ -149,8 +149,9 @@ notimplemented(void)
char str[64];
int n;
- n = sprintf(str, "Operation not implemented on ROM version %d\r\n",
- promops.po_version);
+ n = snprintf(str, sizeof(str),
+ "Operation not implemented on ROM version %d\r\n",
+ promops.po_version);
/*
* Use PROM vector directly, in case we're called before prom_init().
Index: src/sys/arch/sparc/stand/common/mmu.c
diff -u src/sys/arch/sparc/stand/common/mmu.c:1.8 src/sys/arch/sparc/stand/common/mmu.c:1.9
--- src/sys/arch/sparc/stand/common/mmu.c:1.8 Mon Apr 28 16:23:36 2008
+++ src/sys/arch/sparc/stand/common/mmu.c Wed Mar 26 11:55:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mmu.c,v 1.8 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: mmu.c,v 1.9 2014/03/26 15:55:44 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ int mmu_init(void)
char buf[32];
pmap_map = pmap_map_srmmu;
pmap_extract = pmap_extract_srmmu;
- sprintf(buf, "obmem %lx L!", (u_long)&obmem);
+ snprintf(buf, sizeof(buf), "obmem %lx L!", (u_long)&obmem);
prom_interpret(buf);
} else
return (ENOTSUP);
@@ -143,7 +143,8 @@ int pmap_map_srmmu(vaddr_t va, paddr_t p
{
char buf[64];
- sprintf(buf, "%lx %x %lx %lx map-pages", pa, obmem, va, size);
+ snprintf(buf, sizeof(buf), "%lx %x %lx %lx map-pages",
+ pa, obmem, va, size);
if (boothowto & AB_VERBOSE)
printf("Mapping kernel: %s\n", buf);
@@ -158,7 +159,7 @@ int pmap_extract_srmmu(vaddr_t va, paddr
u_int pte;
va &= -NBPG;
- sprintf(buf, "%lx pgmap@ %lx L!", va, (u_long)&pte);
+ snprintf(buf, sizeof(buf), "%lx pgmap@ %lx L!", va, (u_long)&pte);
prom_interpret(buf);
if ((pte & SRMMU_TETYPE) != SRMMU_TEPTE)
return (EFAULT);
