Module Name: src
Committed By: christos
Date: Wed Mar 26 08:52:00 UTC 2014
Modified Files:
src/sys/arch/arm/at91: at91aic.c
src/sys/arch/arm/ep93xx: ep93xx_intr.c
src/sys/arch/arm/footbridge: footbridge_irqhandler.c footbridge_pci.c
src/sys/arch/arm/footbridge/isa: isa_machdep.c
src/sys/arch/arm/iomd: iomd_irqhandler.c
src/sys/arch/arm/ixp12x0: ixp12x0_intr.c
src/sys/arch/arm/marvell: pci_machdep.c
src/sys/arch/arm/omap: omap_intr.c ti_iic.c
src/sys/arch/arm/s3c2xx0: s3c2xx0_intr.c
src/sys/arch/arm/xscale: ixp425_intr.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/at91/at91aic.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/ep93xx/ep93xx_intr.c
cvs rdiff -u -r1.23 -r1.24 \
src/sys/arch/arm/footbridge/footbridge_irqhandler.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/footbridge/footbridge_pci.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/footbridge/isa/isa_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/iomd/iomd_irqhandler.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/marvell/pci_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/omap/omap_intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/ti_iic.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/xscale/ixp425_intr.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/arm/at91/at91aic.c
diff -u src/sys/arch/arm/at91/at91aic.c:1.10 src/sys/arch/arm/at91/at91aic.c:1.11
--- src/sys/arch/arm/at91/at91aic.c:1.10 Mon Nov 12 13:00:36 2012
+++ src/sys/arch/arm/at91/at91aic.c Wed Mar 26 04:51:59 2014
@@ -1,5 +1,5 @@
-/* $Id: at91aic.c,v 1.10 2012/11/12 18:00:36 skrll Exp $ */
-/* $NetBSD: at91aic.c,v 1.10 2012/11/12 18:00:36 skrll Exp $ */
+/* $Id: at91aic.c,v 1.11 2014/03/26 08:51:59 christos Exp $ */
+/* $NetBSD: at91aic.c,v 1.11 2014/03/26 08:51:59 christos Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -251,7 +251,7 @@ at91aic_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);
}
/* All interrupts should use IRQ not FIQ */
Index: src/sys/arch/arm/ep93xx/ep93xx_intr.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.21 src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.22
--- src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.21 Sun Mar 2 08:22:32 2014
+++ src/sys/arch/arm/ep93xx/ep93xx_intr.c Wed Mar 26 04:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_intr.c,v 1.21 2014/03/02 13:22:32 joerg Exp $ */
+/* $NetBSD: ep93xx_intr.c,v 1.22 2014/03/26 08:51:59 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.21 2014/03/02 13:22:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.22 2014/03/26 08:51:59 christos Exp $");
/*
* Interrupt support for the Cirrus Logic EP93XX
@@ -255,7 +255,7 @@ ep93xx_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);
evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
NULL, (i < VIC_NIRQ ? "vic1" : "vic2"),
iq->iq_name);
Index: src/sys/arch/arm/footbridge/footbridge_irqhandler.c
diff -u src/sys/arch/arm/footbridge/footbridge_irqhandler.c:1.23 src/sys/arch/arm/footbridge/footbridge_irqhandler.c:1.24
--- src/sys/arch/arm/footbridge/footbridge_irqhandler.c:1.23 Sun Dec 19 19:25:27 2010
+++ src/sys/arch/arm/footbridge/footbridge_irqhandler.c Wed Mar 26 04:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_irqhandler.c,v 1.23 2010/12/20 00:25:27 matt Exp $ */
+/* $NetBSD: footbridge_irqhandler.c,v 1.24 2014/03/26 08:51:59 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0,"$NetBSD: footbridge_irqhandler.c,v 1.23 2010/12/20 00:25:27 matt Exp $");
+__KERNEL_RCSID(0,"$NetBSD: footbridge_irqhandler.c,v 1.24 2014/03/26 08:51:59 christos Exp $");
#include "opt_irqstats.h"
@@ -196,7 +196,7 @@ footbridge_intr_init(void)
for (i = 0, iq = footbridge_intrq; i < NIRQ; i++, iq++) {
TAILQ_INIT(&iq->iq_list);
- sprintf(iq->iq_name, "irq %d", i);
+ snprintf(iq->iq_name, sizeof(iq->iq_name), "irq %d", i);
evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
NULL, "footbridge", iq->iq_name);
}
Index: src/sys/arch/arm/footbridge/footbridge_pci.c
diff -u src/sys/arch/arm/footbridge/footbridge_pci.c:1.24 src/sys/arch/arm/footbridge/footbridge_pci.c:1.25
--- src/sys/arch/arm/footbridge/footbridge_pci.c:1.24 Sat Oct 27 13:17:37 2012
+++ src/sys/arch/arm/footbridge/footbridge_pci.c Wed Mar 26 04:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_pci.c,v 1.24 2012/10/27 17:17:37 chs Exp $ */
+/* $NetBSD: footbridge_pci.c,v 1.25 2014/03/26 08:51:59 christos Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.24 2012/10/27 17:17:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.25 2014/03/26 08:51:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -318,11 +318,11 @@ footbridge_pci_intr_string(void *pcv, pc
#if NISA > 0
if (ih >= 0x80 && ih <= 0x8f) {
- sprintf(irqstr, "isairq %ld", (ih & 0x0f));
+ snprintf(irqstr, sizeof(irqstr), "isairq %ld", (ih & 0x0f));
return(irqstr);
}
#endif
- sprintf(irqstr, "irq %ld", ih);
+ snprintf(irqstr, sizeof(irqstr), "irq %ld", ih);
return(irqstr);
}
Index: src/sys/arch/arm/footbridge/isa/isa_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.20 src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.21
--- src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.20 Sun Nov 17 03:32:55 2013
+++ src/sys/arch/arm/footbridge/isa/isa_machdep.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.20 2013/11/17 08:32:55 skrll Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.21 2014/03/26 08:52:00 christos Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.20 2013/11/17 08:32:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.21 2014/03/26 08:52:00 christos Exp $");
#include "opt_irqstats.h"
@@ -440,7 +440,7 @@ isa_intr_init(void)
iq = &isa_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);
evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
NULL, "isa", iq->iq_name);
}
Index: src/sys/arch/arm/iomd/iomd_irqhandler.c
diff -u src/sys/arch/arm/iomd/iomd_irqhandler.c:1.18 src/sys/arch/arm/iomd/iomd_irqhandler.c:1.19
--- src/sys/arch/arm/iomd/iomd_irqhandler.c:1.18 Sun Dec 19 19:25:28 2010
+++ src/sys/arch/arm/iomd/iomd_irqhandler.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_irqhandler.c,v 1.18 2010/12/20 00:25:28 matt Exp $ */
+/* $NetBSD: iomd_irqhandler.c,v 1.19 2014/03/26 08:52:00 christos Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.18 2010/12/20 00:25:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.19 2014/03/26 08:52:00 christos Exp $");
#include "opt_irqstats.h"
@@ -178,14 +178,11 @@ irq_claim(int irq, irqhandler_t *handler
#ifdef IRQSTATS
/* Get the interrupt name from the head of the list */
+ char *iptr = _intrnames + (irq * 14);
if (handler->ih_name) {
- char *ptr = _intrnames + (irq * 14);
- strcpy(ptr, " ");
- strncpy(ptr, handler->ih_name,
- min(strlen(handler->ih_name), 13));
+ strlcpy(iptr, handler->ih_name, 14)
} else {
- char *ptr = _intrnames + (irq * 14);
- sprintf(ptr, "irq %2d ", irq);
+ snprintf(iptr, 14, "irq %2d ", irq);
}
#endif /* IRQSTATS */
@@ -255,9 +252,6 @@ irq_release(int irq, irqhandler_t *handl
int level;
irqhandler_t *irqhand;
irqhandler_t **prehand;
-#ifdef IRQSTATS
- extern char *_intrnames;
-#endif
/*
* IRQ_INSTRUCT indicates that we should get the irq number
@@ -294,14 +288,11 @@ irq_release(int irq, irqhandler_t *handl
#ifdef IRQSTATS
/* Get the interrupt name from the head of the list */
+ char *iptr = _intrnames + (irq * 14);
if (irqhandlers[irq] && irqhandlers[irq]->ih_name) {
- char *ptr = _intrnames + (irq * 14);
- strcpy(ptr, " ");
- strncpy(ptr, irqhandlers[irq]->ih_name,
- min(strlen(irqhandlers[irq]->ih_name), 13));
+ strlcpy(iptr, irqhandlers[irq]->ih_name, 14);
} else {
- char *ptr = _intrnames + (irq * 14);
- sprintf(ptr, "irq %2d ", irq);
+ snprintf(iptr, 14, "irq %2d ", irq);
}
#endif /* IRQSTATS */
Index: src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.28 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.29
--- src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.28 Thu Mar 20 02:48:54 2014
+++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_intr.c,v 1.28 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: ixp12x0_intr.c,v 1.29 2014/03/26 08:52:00 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.28 2014/03/20 06:48:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.29 2014/03/26 08:52:00 christos Exp $");
/*
* Interrupt support for the Intel ixp12x0
@@ -312,7 +312,7 @@ ixp12x0_intr_init(void)
iq = &intrq[i];
TAILQ_INIT(&iq->iq_list);
- sprintf(iq->iq_name, "ipl %d", i);
+ snprintf(iq->iq_name, sizeof(iq->iq_name), "ipl %d", i);
evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
NULL, "ixpintr", iq->iq_name);
}
Index: src/sys/arch/arm/marvell/pci_machdep.c
diff -u src/sys/arch/arm/marvell/pci_machdep.c:1.5 src/sys/arch/arm/marvell/pci_machdep.c:1.6
--- src/sys/arch/arm/marvell/pci_machdep.c:1.5 Wed May 1 08:38:06 2013
+++ src/sys/arch/arm/marvell/pci_machdep.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.5 2013/05/01 12:38:06 rkujawa Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.6 2014/03/26 08:52:00 christos Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.5 2013/05/01 12:38:06 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.6 2014/03/26 08:52:00 christos Exp $");
#include "opt_mvsoc.h"
#include "gtpci.h"
@@ -321,7 +321,8 @@ gtpci_gpp_intr_string(void *v, pci_intr_
int2gpp = prop_dictionary_get(device_properties(sc->sc_dev), "int2gpp");
gpp = prop_array_get(int2gpp, pin);
- sprintf(intrstr, "gpp %d", (int)prop_number_integer_value(gpp));
+ snprintf(intrstr, sizeof(intrstr), "gpp %d",
+ (int)prop_number_integer_value(gpp));
return intrstr;
}
Index: src/sys/arch/arm/omap/omap_intr.c
diff -u src/sys/arch/arm/omap/omap_intr.c:1.10 src/sys/arch/arm/omap/omap_intr.c:1.11
--- src/sys/arch/arm/omap/omap_intr.c:1.10 Tue Feb 4 13:51:16 2014
+++ src/sys/arch/arm/omap/omap_intr.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_intr.c,v 1.10 2014/02/04 18:51:16 matt Exp $ */
+/* $NetBSD: omap_intr.c,v 1.11 2014/03/26 08:52:00 christos Exp $ */
/*
* Based on arch/arm/xscale/pxa2x0_intr.c
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_intr.c,v 1.10 2014/02/04 18:51:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_intr.c,v 1.11 2014/03/26 08:52:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,7 +174,8 @@ omapintc_attach(device_t parent, device_
handler[i].func = stray_interrupt;
handler[i].cookie = (void *)(intptr_t) i;
extirq_level[i] = IPL_SERIAL;
- sprintf(handler[i].irq_num_str, "#%d", i);
+ snprintf(handler[i].irq_num_str,
+ sizeof(handler[i].irq_num_str), "#%d", i);
if (handler[i].name == NULL)
omapintc_set_name(i, handler[i].irq_num_str, false);
}
Index: src/sys/arch/arm/omap/ti_iic.c
diff -u src/sys/arch/arm/omap/ti_iic.c:1.5 src/sys/arch/arm/omap/ti_iic.c:1.6
--- src/sys/arch/arm/omap/ti_iic.c:1.5 Wed Dec 18 07:54:35 2013
+++ src/sys/arch/arm/omap/ti_iic.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_iic.c,v 1.5 2013/12/18 12:54:35 skrll Exp $ */
+/* $NetBSD: ti_iic.c,v 1.6 2014/03/26 08:52:00 christos Exp $ */
/*
* Copyright (c) 2013 Manuel Bouyer. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.5 2013/12/18 12:54:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.6 2014/03/26 08:52:00 christos Exp $");
#include "opt_omap.h"
#include "locators.h"
@@ -238,7 +238,7 @@ ti_iic_attach(device_t parent, device_t
}
}
KASSERT(i < __arraycount(am335x_iic));
- sprintf(buf, "%s_SDA", am335x_iic[i].as_name);
+ snprintf(buf, "%s_SDA", am335x_iic[i].as_name);
if (sitara_cm_padconf_get(buf, &mode, &state) == 0) {
aprint_debug(": SDA mode %s state %d ", mode, state);
}
@@ -247,7 +247,7 @@ ti_iic_attach(device_t parent, device_t
aprint_error(": can't switch %s pad\n", buf);
return;
}
- sprintf(buf, "%s_SCL", am335x_iic[i].as_name);
+ snprintf(buf, sizeof(buf), "%s_SCL", am335x_iic[i].as_name);
if (sitara_cm_padconf_get(buf, &mode, &state) == 0) {
aprint_debug(": SCL mode %s state %d ", mode, state);
}
Index: src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c:1.17 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c:1.18
--- src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c:1.17 Thu Feb 27 17:57:36 2014
+++ src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0_intr.c,v 1.17 2014/02/27 22:57:36 joerg Exp $ */
+/* $NetBSD: s3c2xx0_intr.c,v 1.18 2014/03/26 08:52:00 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr.c,v 1.17 2014/02/27 22:57:36 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr.c,v 1.18 2014/03/26 08:52:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -143,7 +143,8 @@ s3c2xx0_intr_init(struct s3c2xx0_intr_di
dispatch_table[i].func = stray_interrupt;
dispatch_table[i].cookie = (void *) (i);
dispatch_table[i].level = IPL_VM;
- sprintf(dispatch_table[i].name, "irq %d", i);
+ snprintf(dispatch_table[i].name,
+ sizeof(dispatch_table[i].name), "irq %d", i);
evcnt_attach_dynamic(&dispatch_table[i].ev, EVCNT_TYPE_INTR,
NULL, "s3c2xx0", dispatch_table[i].name);
}
Index: src/sys/arch/arm/xscale/ixp425_intr.c
diff -u src/sys/arch/arm/xscale/ixp425_intr.c:1.25 src/sys/arch/arm/xscale/ixp425_intr.c:1.26
--- src/sys/arch/arm/xscale/ixp425_intr.c:1.25 Mon Nov 12 13:00:38 2012
+++ src/sys/arch/arm/xscale/ixp425_intr.c Wed Mar 26 04:52:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_intr.c,v 1.25 2012/11/12 18:00:38 skrll Exp $ */
+/* $NetBSD: ixp425_intr.c,v 1.26 2014/03/26 08:52:00 christos Exp $ */
/*
* Copyright (c) 2003
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_intr.c,v 1.25 2012/11/12 18:00:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_intr.c,v 1.26 2014/03/26 08:52:00 christos Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -307,7 +307,7 @@ ixp425_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);
}
ixp425_intr_calculate_masks();
