Module Name: src
Committed By: matt
Date: Tue Mar 25 16:39:27 UTC 2014
Modified Files:
src/sys/arch/powerpc/pci: pci_machdep_ofw.c
Log Message:
sprintf -> snprintf
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/pci/pci_machdep_ofw.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/powerpc/pci/pci_machdep_ofw.c
diff -u src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.19 src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.20
--- src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.19 Sun Nov 3 22:22:03 2013
+++ src/sys/arch/powerpc/pci/pci_machdep_ofw.c Tue Mar 25 16:39:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_ofw.c,v 1.19 2013/11/03 22:22:03 mrg Exp $ */
+/* $NetBSD: pci_machdep_ofw.c,v 1.20 2014/03/25 16:39:27 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep_ofw.c,v 1.19 2013/11/03 22:22:03 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep_ofw.c,v 1.20 2014/03/25 16:39:27 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -238,12 +238,12 @@ genofw_setup_pciintr_map(void *v, struct
sub = prop_dictionary_create_with_capacity(4);
pin = map[i*reclen + acells];
intr_num = prop_number_create_integer(map[i*reclen + acells + icells + 1] + picnodes[pic].offset);
- sprintf(key, "pin-%c", 'A' + (pin-1));
+ snprintf(key, sizeof(key), "pin-%c", 'A' + (pin-1));
prop_dictionary_set(sub, key, intr_num);
prop_object_release(intr_num);
/* should we care about level? */
- sprintf(key, "devfunc-%d", dev*0x8 + func);
+ snprintf(key, sizeof(key), "devfunc-%d", dev*0x8 + func);
prop_dictionary_set(dict, key, sub);
if (curdev != dev) {
prop_object_release(sub);
@@ -293,10 +293,10 @@ nomap:
if (OF_getprop(node, "interrupts", &pin, 4) < 0)
pin = 1;
intr_num = prop_number_create_integer(irqs[0]);
- sprintf(key, "pin-%c", 'A' + (pin-1));
+ snprintf(key, sizeof(key), "pin-%c", 'A' + (pin-1));
prop_dictionary_set(sub, key, intr_num);
prop_object_release(intr_num);
- sprintf(key, "devfunc-%d", dev*0x8 + func);
+ snprintf(key, sizeof(key), "devfunc-%d", dev*0x8 + func);
prop_dictionary_set(dict, key, sub);
prop_object_release(sub);
foundirqs++;
@@ -331,10 +331,10 @@ nomap:
if (OF_getprop(node, "interrupts", &pin, 4) < 0)
pin = 1;
intr_num = prop_number_create_integer(irq);
- sprintf(key, "pin-%c", 'A' + (pin-1));
+ snprintf(key, sizeof(key), "pin-%c", 'A' + (pin-1));
prop_dictionary_set(sub, key, intr_num);
prop_object_release(intr_num);
- sprintf(key, "devfunc-%d", dev*0x8 + func);
+ snprintf(key, sizeof(key), "devfunc-%d", dev*0x8 + func);
prop_dictionary_set(dict, key, sub);
prop_object_release(sub);
}
@@ -430,11 +430,11 @@ genofw_pci_intr_map(const struct pci_att
goto bad;
}
- sprintf(key, "devfunc-%d", dev*0x8 + func);
+ snprintf(key, sizeof(key), "devfunc-%d", dev*0x8 + func);
devsub = prop_dictionary_get(dict, key);
if (devsub == NULL)
goto bad;
- sprintf(key, "pin-%c", 'A' + (pin-1));
+ snprintf(key, sizeof(key), "pin-%c", 'A' + (pin-1));
pinsub = prop_dictionary_get(devsub, key);
if (pinsub == NULL)
goto bad;
