CVS commit: src/sys/dev/raidframe

[Nathanial Sloss]

Module Name:    src
Committed By:   nat
Date:           Sun Dec 11 05:27:00 UTC 2016

Modified Files:
        src/sys/dev/raidframe: rf_dagffrd.c rf_engine.c

Log Message:
Ensure variables are initialized.  Fixes error due to -Wmaybe-unitialized.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/raidframe/rf_dagffrd.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/raidframe/rf_engine.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/dev/raidframe/rf_dagffrd.c
diff -u src/sys/dev/raidframe/rf_dagffrd.c:1.19 src/sys/dev/raidframe/rf_dagffrd.c:1.20
--- src/sys/dev/raidframe/rf_dagffrd.c:1.19	Sun Sep 15 12:23:06 2013
+++ src/sys/dev/raidframe/rf_dagffrd.c	Sun Dec 11 05:27:00 2016
@@ -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 *raid
 	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:

Index: src/sys/dev/raidframe/rf_engine.c
diff -u src/sys/dev/raidframe/rf_engine.c:1.51 src/sys/dev/raidframe/rf_engine.c:1.52
--- src/sys/dev/raidframe/rf_engine.c:1.51	Sun Jan  3 08:17:24 2016
+++ src/sys/dev/raidframe/rf_engine.c	Sun Dec 11 05:27:00 2016
@@ -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");