Module Name: src
Committed By: christos
Date: Wed Mar 26 17:40:03 UTC 2014
Modified Files:
src/sys/arch/evbarm/ifpga: ifpga_pci.c
src/sys/arch/evbarm/iq80310: iq80310_intr.c iq80310_pci.c
src/sys/arch/evbarm/ixdp425: ixdp425_pci.c
src/sys/arch/evbarm/ixm1200: ixm1200_pci.c nappi_nppb.c
Log Message:
kill sprintf.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/ifpga/ifpga_pci.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/iq80310/iq80310_intr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/iq80310/iq80310_pci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ixm1200/ixm1200_pci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixm1200/nappi_nppb.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/evbarm/ifpga/ifpga_pci.c
diff -u src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.16 src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.17
--- src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.16 Sun Mar 9 15:55:48 2014
+++ src/sys/arch/evbarm/ifpga/ifpga_pci.c Wed Mar 26 13:40:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpga_pci.c,v 1.16 2014/03/09 19:55:48 martin Exp $ */
+/* $NetBSD: ifpga_pci.c,v 1.17 2014/03/26 17:40:03 christos Exp $ */
/*
* Copyright (c) 2001 ARM Ltd
@@ -64,7 +64,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.16 2014/03/09 19:55:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.17 2014/03/26 17:40:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -335,7 +335,7 @@ ifpga_pci_intr_string(void *pcv, pci_int
if (ih == 0)
panic("ifpga_pci_intr_string: bogus handle 0x%lx", ih);
- sprintf(irqstr, "pciint%ld", ih - IFPGA_INTRNUM_PCIINT0);
+ snprintf(irqstr, sizeof(irqstr), "pciint%ld", ih - IFPGA_INTRNUM_PCIINT0);
return irqstr;
}
Index: src/sys/arch/evbarm/iq80310/iq80310_intr.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.33 src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.34
--- src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.33 Tue Jan 28 07:01:31 2014
+++ src/sys/arch/evbarm/iq80310/iq80310_intr.c Wed Mar 26 13:40:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_intr.c,v 1.33 2014/01/28 12:01:31 martin Exp $ */
+/* $NetBSD: iq80310_intr.c,v 1.34 2014/03/26 17:40:03 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.33 2014/01/28 12:01:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.34 2014/03/26 17:40:03 christos Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -337,7 +337,7 @@ iq80310_intr_init(void)
iq = &intrq[i];
TAILQ_INIT(&iq->iq_list);
- sprintf(iq->iq_name, "irq %d", i);
+ snprintf(iq->iq_name, sizeof(iq->iq_name), "irq %d", i);
}
iq80310_intr_calculate_masks();
Index: src/sys/arch/evbarm/iq80310/iq80310_pci.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.11 src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.12
--- src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.11 Fri Jul 1 16:41:16 2011
+++ src/sys/arch/evbarm/iq80310/iq80310_pci.c Wed Mar 26 13:40:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_pci.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $ */
+/* $NetBSD: iq80310_pci.c,v 1.12 2014/03/26 17:40:03 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.11 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.12 2014/03/26 17:40:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,7 +234,7 @@ iq80310_pci_intr_string(void *v, pci_int
{
static char irqstr[IRQNAMESIZE];
- sprintf(irqstr, "iq80310 irq %ld", ih);
+ snprintf(irqstr, sizeof(irqstr), "iq80310 irq %ld", ih);
return (irqstr);
}
Index: src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.9 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.10
--- src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.9 Mon Nov 12 13:00:39 2012
+++ src/sys/arch/evbarm/ixdp425/ixdp425_pci.c Wed Mar 26 13:40:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_pci.c,v 1.9 2012/11/12 18:00:39 skrll Exp $ */
+/* $NetBSD: ixdp425_pci.c,v 1.10 2014/03/26 17:40:03 christos Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.9 2012/11/12 18:00:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.10 2014/03/26 17:40:03 christos Exp $");
/*
* IXDP425 PCI interrupt support.
@@ -219,7 +219,7 @@ ixdp425_pci_intr_string(void *v, pci_int
{
static char irqstr[IRQNAMESIZE];
- sprintf(irqstr, "ixp425 irq %ld", ih);
+ snprintf(irqstr, sizeof(irqstr), "ixp425 irq %ld", ih);
return (irqstr);
}
Index: src/sys/arch/evbarm/ixm1200/ixm1200_pci.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.9 src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.10
--- src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.9 Fri Jul 1 16:42:37 2011
+++ src/sys/arch/evbarm/ixm1200/ixm1200_pci.c Wed Mar 26 13:40:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_pci.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
+/* $NetBSD: ixm1200_pci.c,v 1.10 2014/03/26 17:40:03 christos Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2002, 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.10 2014/03/26 17:40:03 christos Exp $");
/*
* IXM1200 PCI interrupt support.
@@ -94,7 +94,7 @@ ixm1200_pci_intr_string(void *v, pci_int
{
static char irqstr[IRQNAMESIZE];
- sprintf(irqstr, "IXM1200 irq %ld", ih);
+ snprintf(irqstr, sizeof(irqstr), "IXM1200 irq %ld", ih);
return (irqstr);
}
Index: src/sys/arch/evbarm/ixm1200/nappi_nppb.c
diff -u src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.11 src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.12
--- src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.11 Mon Nov 12 13:00:39 2012
+++ src/sys/arch/evbarm/ixm1200/nappi_nppb.c Wed Mar 26 13:40:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nappi_nppb.c,v 1.11 2012/11/12 18:00:39 skrll Exp $ */
+/* $NetBSD: nappi_nppb.c,v 1.12 2014/03/26 17:40:03 christos Exp $ */
/*
* Copyright (c) 2002, 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.11 2012/11/12 18:00:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.12 2014/03/26 17:40:03 christos Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -126,7 +126,7 @@ nppbattach(device_t parent, device_t sel
psc->psc_pc = pc;
psc->psc_tag = pa->pa_tag;
- sprintf(devinfo, "21555 Non-Transparent PCI-PCI Bridge");
+ snprintf(devinfo, sizeof(devinfo), "21555 Non-Transparent PCI-PCI Bridge");
aprint_normal(": %s, rev %d\n", devinfo, PCI_REVISION(pa->pa_class));
/* Make sure bus-mastering is enabled. */
