From c80fd070582d7071462ed31499f8c4fd8b6f7bbe Mon Sep 17 00:00:00 2001
From: Andrea Mazzoleni <amadvance@gmail.com>
Date: Sun, 20 Dec 2015 17:23:58 +0100
Subject: [PATCH] Remove warnings when building with low optimizations

---
 cmdline/handle.c | 3 ++-
 cmdline/state.c  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmdline/handle.c b/cmdline/handle.c
index 1bc2f86e..531ba1e7 100644
--- a/cmdline/handle.c
+++ b/cmdline/handle.c
@@ -416,12 +416,13 @@ struct snapraid_handle* handle_map(struct snapraid_state* state, unsigned* handl
 		tommy_node* k;
 
 		/* search the mapping for this disk */
+		map = 0;
 		for (k = state->maplist; k != 0; k = k->next) {
 			map = k->data;
 			if (strcmp(disk->name, map->name) == 0)
 				break;
 		}
-		if (k == 0) {
+		if (!map) {
 			/* LCOV_EXCL_START */
 			log_fatal("Internal error for inconsistent disk mapping.\n");
 			os_abort();
diff --git a/cmdline/state.c b/cmdline/state.c
index cc8acad9..4c73f38a 100644
--- a/cmdline/state.c
+++ b/cmdline/state.c
@@ -924,14 +924,16 @@ void state_config(struct snapraid_state* state, const char* path, const char* co
 
 				pathcpy(state->parity[level].smartctl, sizeof(state->parity[level].smartctl), custom);
 			} else {
-				/* search the disk */
 				struct snapraid_disk* disk;
+
+				/* search the disk */
+				disk = 0;
 				for (i = state->disklist; i != 0; i = i->next) {
 					disk = i->data;
 					if (strcmp(disk->name, buffer) == 0)
 						break;
 				}
-				if (!i) {
+				if (!disk) {
 					/* LCOV_EXCL_START */
 					log_fatal("Missing disk smartctl '%s' at line %u\n", buffer, line);
 					exit(EXIT_FAILURE);