summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2004-04-22 00:17:10 +0000
committeritojun <itojun@NetBSD.org>2004-04-22 00:17:10 +0000
commitaca4c091d32e5d41fde26cf072df6355ec7fa79b (patch)
tree498f57df69e0a3d0b702d3aa166ed352fe32e53f /sys/dev/mca
parentfd2a977729985cfb18c9fefeca871d3649724943 (diff)
sprintf -> snprintf
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/mca.c6
-rw-r--r--sys/dev/mca/mca_subr.c11
-rw-r--r--sys/dev/mca/mcavar.h4
3 files changed, 11 insertions, 10 deletions
diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c
index 48559857069..31dc5bf2ef7 100644
--- a/sys/dev/mca/mca.c
+++ b/sys/dev/mca/mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.13 2003/01/01 00:10:21 thorpej Exp $ */
+/* $NetBSD: mca.c,v 1.14 2004/04/22 00:17:12 itojun Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.13 2003/01/01 00:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.14 2004/04/22 00:17:12 itojun Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@ mca_print(aux, pnp)
char devinfo[256];
if (pnp) {
- mca_devinfo(ma->ma_id, devinfo);
+ mca_devinfo(ma->ma_id, devinfo, sizeof(devinfo));
aprint_normal("%s slot %d: %s", pnp, ma->ma_slot + 1, devinfo);
}
diff --git a/sys/dev/mca/mca_subr.c b/sys/dev/mca/mca_subr.c
index 91e81709ffe..ccda26a3f58 100644
--- a/sys/dev/mca/mca_subr.c
+++ b/sys/dev/mca/mca_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_subr.c,v 1.5 2001/11/13 07:46:26 lukem Exp $ */
+/* $NetBSD: mca_subr.c,v 1.6 2004/04/22 00:17:12 itojun Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_subr.c,v 1.5 2001/11/13 07:46:26 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_subr.c,v 1.6 2004/04/22 00:17:12 itojun Exp $");
#include "opt_mcaverbose.h"
@@ -67,9 +67,10 @@ struct mca_knowndev {
#endif /* MCAVERBOSE */
void
-mca_devinfo(id, cp)
+mca_devinfo(id, cp, l)
int id;
char *cp;
+ size_t l;
{
#ifdef MCAVERBOSE
const struct mca_knowndev *kdp;
@@ -78,10 +79,10 @@ mca_devinfo(id, cp)
for (; kdp->name != NULL && kdp->id != id; kdp++);
if (kdp->name != NULL)
- sprintf(cp, "%s (0x%04x)", kdp->name, id);
+ snprintf(cp, l, "%s (0x%04x)", kdp->name, id);
else
#endif /* MCAVERBOSE */
- sprintf(cp, "product 0x%04x", id);
+ snprintf(cp, l, "product 0x%04x", id);
}
/*
diff --git a/sys/dev/mca/mcavar.h b/sys/dev/mca/mcavar.h
index a29d408cc69..a3b9b103a78 100644
--- a/sys/dev/mca/mcavar.h
+++ b/sys/dev/mca/mcavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcavar.h,v 1.3 2001/04/27 17:11:45 jdolecek Exp $ */
+/* $NetBSD: mcavar.h,v 1.4 2004/04/22 00:17:12 itojun Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ struct mca_attach_args {
#define mcacf_slot cf_loc[0]
#define MCA_UNKNOWN_SLOT -1 /* wildcarded 'slot' */
-void mca_devinfo __P((int, char *));
+void mca_devinfo __P((int, char *, size_t));
int mca_match_disabled __P((int));
#endif /* _DEV_MCA_MCAVAR_H_ */