From de3abfa6222c7c35f8262032112fea3b6098fd58 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Wed, 8 Jan 2014 10:56:05 +0100 Subject: [PATCH] thin: cleanup _thin_pool_add_message Make this code a bit more readable for Coverity as otherwise it marks the "type" variable in the "_thin_pool_add_message" fn as undefined for certain path (...which is normally unreachable anyway, but let's clean this up). --- lib/thin/thin.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/thin/thin.c b/lib/thin/thin.c index df6482eb3..ff263d9ce 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -62,16 +62,10 @@ static int _thin_pool_add_message(struct lv_segment *seg, lv_name); /* FIXME: switch to _SNAP later, if the created LV has an origin */ type = DM_THIN_MESSAGE_CREATE_THIN; - } - - if (!dm_config_get_uint32(sn, "delete", &delete_id)) { - if (!lv) - return SEG_LOG_ERROR("Unknown message in"); - } else { - if (lv) - return SEG_LOG_ERROR("Unsupported message format in"); + } else if (dm_config_get_uint32(sn, "delete", &delete_id)) type = DM_THIN_MESSAGE_DELETE; - } + else + return SEG_LOG_ERROR("Unknown message in"); if (!attach_pool_message(seg, type, lv, delete_id, 1)) return_0;