summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
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/raidframe
parentfd2a977729985cfb18c9fefeca871d3649724943 (diff)
sprintf -> snprintf
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_disks.c13
-rw-r--r--sys/dev/raidframe/rf_driver.c10
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c15
3 files changed, 21 insertions, 17 deletions
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c
index 79657bd3f65..12f6adc3a65 100644
--- a/sys/dev/raidframe/rf_disks.c
+++ b/sys/dev/raidframe/rf_disks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.51 2004/03/21 06:32:03 oster Exp $ */
+/* $NetBSD: rf_disks.c,v 1.52 2004/04/22 00:17:12 itojun Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -67,7 +67,7 @@
***************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.51 2004/03/21 06:32:03 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.52 2004/04/22 00:17:12 itojun Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -465,9 +465,9 @@ rf_AutoConfigureDisks(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr,
raidPtr->raid_cinfo[c].ci_dev = ac->dev;
memcpy(&raidPtr->raid_cinfo[c].ci_label,
- ac->clabel, sizeof(*ac->clabel));
- sprintf(diskPtr->devname, "/dev/%s",
- ac->devname);
+ ac->clabel, sizeof(*ac->clabel));
+ snprintf(diskPtr->devname, sizeof(diskPtr->devname),
+ "/dev/%s", ac->devname);
/* note the fact that this component was
autoconfigured. You'll need this info
@@ -517,7 +517,8 @@ rf_AutoConfigureDisks(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr,
/* Didn't find it at all!! Component must
really be dead */
disks[c].status = rf_ds_failed;
- sprintf(disks[c].devname, "component%d", c);
+ snprintf(disks[c].devname, sizeof(disks[c].devname),
+ "component%d", c);
numFailuresThisRow++;
}
}
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 3b0713f98e3..240230e4d64 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.100 2004/04/10 05:52:33 oster Exp $ */
+/* $NetBSD: rf_driver.c,v 1.101 2004/04/22 00:17:12 itojun Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.100 2004/04/10 05:52:33 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.101 2004/04/22 00:17:12 itojun Exp $");
#include "opt_raid_diagnostic.h"
@@ -840,15 +840,15 @@ rf_ConfigureDebug(RF_Config_t *cfgPtr)
void
rf_print_panic_message(int line, char *file)
{
- sprintf(rf_panicbuf,"raidframe error at line %d file %s",
- line, file);
+ snprintf(rf_panicbuf, sizeof(rf_panicbuf),
+ "raidframe error at line %d file %s", line, file);
}
#ifdef RAID_DIAGNOSTIC
void
rf_print_assert_panic_message(int line, char *file, char *condition)
{
- sprintf(rf_panicbuf,
+ snprintf(rf_panicbuf, sizeof(rf_panicbuf),
"raidframe error at line %d file %s (failed asserting %s)\n",
line, file, condition);
}
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 1714d00e4b1..91001a3167e 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.178 2004/03/07 22:15:19 oster Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.179 2004/04/22 00:17:13 itojun Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.178 2004/03/07 22:15:19 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.179 2004/04/22 00:17:13 itojun Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -403,7 +403,8 @@ raidattach(int num)
raidrootdev[raidID].dv_unit = raidID;
raidrootdev[raidID].dv_parent = NULL;
raidrootdev[raidID].dv_flags = 0;
- sprintf(raidrootdev[raidID].dv_xname,"raid%d",raidID);
+ snprintf(raidrootdev[raidID].dv_xname,
+ sizeof(raidrootdev[raidID].dv_xname), "raid%d", raidID);
RF_Malloc(raidPtrs[raidID], sizeof(RF_Raid_t),
(RF_Raid_t *));
@@ -1602,7 +1603,8 @@ raidinit(RF_Raid_t *raidPtr)
/* XXX should check return code first... */
rs->sc_flags |= RAIDF_INITED;
- sprintf(rs->sc_xname, "raid%d", unit); /* XXX doesn't check bounds. */
+ /* XXX doesn't check bounds. */
+ snprintf(rs->sc_xname, sizeof(rs->sc_xname), "raid%d", unit);
rs->sc_dkdev.dk_name = rs->sc_xname;
@@ -2722,8 +2724,9 @@ rf_find_raid_components()
return(NULL);
}
- sprintf(ac->devname, "%s%c",
- dv->dv_xname, 'a'+i);
+ snprintf(ac->devname,
+ sizeof(ac->devname), "%s%c",
+ dv->dv_xname, 'a'+i);
ac->dev = dev;
ac->vp = vp;
ac->clabel = clabel;