From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Fri, 28 Jan 2011 10:16:04 +0000 (+0000)
Subject: Skip NULL check before dm_free
X-Git-Tag: v2_02_91~1154
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=a5c6acf22af82fa14b6224d1eeb62dae21c82495;p=lvm2.git

Skip NULL check before dm_free

dm_free checks for NULL itself.
---

diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index e0212a216..2d47ff5e8 100644
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -69,8 +69,7 @@ void archive_exit(struct cmd_context *cmd)
 {
 	if (!cmd->archive_params)
 		return;
-	if (cmd->archive_params->dir)
-		dm_free(cmd->archive_params->dir);
+	dm_free(cmd->archive_params->dir);
 	memset(cmd->archive_params, 0, sizeof(*cmd->archive_params));
 }
 
@@ -183,8 +182,7 @@ void backup_exit(struct cmd_context *cmd)
 {
 	if (!cmd->backup_params)
 		return;
-	if (cmd->backup_params->dir)
-		dm_free(cmd->backup_params->dir);
+	dm_free(cmd->backup_params->dir);
 	memset(cmd->backup_params, 0, sizeof(*cmd->backup_params));
 }
 
diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index 5ed8a339a..d8f7de272 100644
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -279,8 +279,7 @@ static int _cluster_request(char clvmd_cmd, const char *node, void *data, int le
 	*response = rarray;
 
       out:
-	if (retbuf)
-		dm_free(retbuf);
+	dm_free(retbuf);
 
 	return status;
 }
diff --git a/lib/misc/timestamp.c b/lib/misc/timestamp.c
index 62e1be869..47b5586ad 100644
--- a/lib/misc/timestamp.c
+++ b/lib/misc/timestamp.c
@@ -125,6 +125,5 @@ int cmp_timestamp(struct timestamp *t1, struct timestamp *t2)
 
 void destroy_timestamp(struct timestamp *t)
 {
-	if (t)
-		dm_free(t);
+	dm_free(t);
 }
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 92c8e9ecd..25714ce39 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -486,20 +486,11 @@ void dm_task_destroy(struct dm_task *dmt)
 		dm_free(t);
 	}
 
-	if (dmt->dev_name)
-		dm_free(dmt->dev_name);
-
-	if (dmt->newname)
-		dm_free(dmt->newname);
-
-	if (dmt->message)
-		dm_free(dmt->message);
-
 	_dm_zfree_dmi(dmt->dmi.v4);
-
-	if (dmt->uuid)
-		dm_free(dmt->uuid);
-
+	dm_free(dmt->dev_name);
+	dm_free(dmt->newname);
+	dm_free(dmt->message);
+	dm_free(dmt->uuid);
 	dm_free(dmt);
 }