summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authornat <nat@NetBSD.org>2016-12-11 05:27:00 +0000
committernat <nat@NetBSD.org>2016-12-11 05:27:00 +0000
commitf728fb21bd4a7ce77dd227dbef66dbbdfd11dc97 (patch)
tree67bb1e2b76ec5b43727ce38b246c16d7364fe75e /sys/dev
parentd27207bb06a9246576f87db2d8d934b6512be348 (diff)
Ensure variables are initialized. Fixes error due to -Wmaybe-unitialized.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/raidframe/rf_dagffrd.c8
-rw-r--r--sys/dev/raidframe/rf_engine.c10
2 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/raidframe/rf_dagffrd.c b/sys/dev/raidframe/rf_dagffrd.c
index 4da4bf2629e..7a279eb45e1 100644
--- a/sys/dev/raidframe/rf_dagffrd.c
+++ b/sys/dev/raidframe/rf_dagffrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffrd.c,v 1.19 2013/09/15 12:23:06 martin Exp $ */
+/* $NetBSD: rf_dagffrd.c,v 1.20 2016/12/11 05:27:00 nat Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.19 2013/09/15 12:23:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.20 2016/12/11 05:27:00 nat Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -139,6 +139,10 @@ rf_CreateNonredundantDAG(RF_Raid_t *raidPtr,
n = asmap->numStripeUnitsAccessed;
dag_h->creator = "NonredundantDAG";
+ doFunc = rf_NullNodeFunc;
+ undoFunc = rf_NullNodeUndoFunc;
+ name = NULL;
+
RF_ASSERT(RF_IO_IS_R_OR_W(type));
switch (type) {
case RF_IO_TYPE_READ:
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index abb67d2495e..99102d04cc7 100644
--- a/sys/dev/raidframe/rf_engine.c
+++ b/sys/dev/raidframe/rf_engine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_engine.c,v 1.51 2016/01/03 08:17:24 mlelstv Exp $ */
+/* $NetBSD: rf_engine.c,v 1.52 2016/12/11 05:27:00 nat Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -55,7 +55,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.51 2016/01/03 08:17:24 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.52 2016/12/11 05:27:00 nat Exp $");
#include <sys/errno.h>
@@ -229,14 +229,14 @@ NodeReady(RF_DagNode_t *node)
{
int ready;
+ ready = RF_FALSE;
+
switch (node->dagHdr->status) {
case rf_enable:
case rf_rollForward:
if ((node->status == rf_wait) &&
(node->numAntecedents == node->numAntDone))
ready = RF_TRUE;
- else
- ready = RF_FALSE;
break;
case rf_rollBackward:
RF_ASSERT(node->numSuccDone <= node->numSuccedents);
@@ -245,8 +245,6 @@ NodeReady(RF_DagNode_t *node)
if ((node->status == rf_good) &&
(node->numSuccDone == node->numSuccedents))
ready = RF_TRUE;
- else
- ready = RF_FALSE;
break;
default:
printf("Execution engine found illegal DAG status in NodeReady\n");