summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorpea <pea@cvs.openbsd.org>2011-04-14 20:59:36 +0000
committerpea <pea@cvs.openbsd.org>2011-04-14 20:59:36 +0000
commite369dc5ef83fad9aeca02d43c10105cf6497d155 (patch)
tree1192d644381f31f86f533950ca7b2c0492b0edef /sys
parent4fe07912aab8ac8b1cec974d88ff45145334011a (diff)
Make RAIDFRAME compile
ok miod@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/raidframe/rf_disks.c4
-rw-r--r--sys/dev/raidframe/rf_openbsdkintf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c
index 56e7dc1d32c..e0409eb77b5 100644
--- a/sys/dev/raidframe/rf_disks.c
+++ b/sys/dev/raidframe/rf_disks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_disks.c,v 1.15 2010/09/23 18:49:39 oga Exp $ */
+/* $OpenBSD: rf_disks.c,v 1.16 2011/04/14 20:59:35 pea Exp $ */
/* $NetBSD: rf_disks.c,v 1.31 2000/06/02 01:17:14 oster Exp $ */
/*
@@ -655,7 +655,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *buf, RF_RaidDisk_t *diskPtr,
diskPtr->status = rf_ds_optimal;
raidPtr->raid_cinfo[row][col].ci_vp = NULL;
- raidPtr->raid_cinfo[row][col].ci_dev = NULL;
+ raidPtr->raid_cinfo[row][col].ci_dev = 0;
error = raidlookup(diskPtr->devname, curproc, &vp);
if (error) {
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index 51a8bd787e3..87918b57b2f 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.60 2010/09/23 18:49:39 oga Exp $ */
+/* $OpenBSD: rf_openbsdkintf.c,v 1.61 2011/04/14 20:59:35 pea Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */
/*-
@@ -3160,7 +3160,7 @@ rf_create_configuration(RF_AutoConfig_t *ac, RF_Config_t *config,
}
for(i=0;i<RF_MAXDBGV;i++) {
- config->debugVars[i][0] = NULL;
+ config->debugVars[i][0] = '\0';
}
#ifdef RAID_DEBUG_ALL