[lvm-devel] [PATCH 01/29] Cleanup remove test for NULL
Zdenek Kabelac
zkabelac at redhat.com
Thu Nov 25 10:55:05 UTC 2010
dm_free test for NULL itself.
Signed-off-by: Zdenek Kabelac <zkabelac at redhat.com>
---
libdm/libdm-common.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index b86739a..2dfa28f 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -250,10 +250,8 @@ int dm_task_set_name(struct dm_task *dmt, const char *name)
char path[PATH_MAX];
struct stat st1, st2;
- if (dmt->dev_name) {
- dm_free(dmt->dev_name);
- dmt->dev_name = NULL;
- }
+ dm_free(dmt->dev_name);
+ dmt->dev_name = NULL;
/*
* Path supplied for existing device?
@@ -292,8 +290,7 @@ int dm_task_set_name(struct dm_task *dmt, const char *name)
if (strlen(name) >= DM_NAME_LEN) {
log_error("Name \"%s\" too long", name);
- if (new_name)
- dm_free(new_name);
+ dm_free(new_name);
return 0;
}
@@ -309,10 +306,7 @@ int dm_task_set_name(struct dm_task *dmt, const char *name)
int dm_task_set_uuid(struct dm_task *dmt, const char *uuid)
{
- if (dmt->uuid) {
- dm_free(dmt->uuid);
- dmt->uuid = NULL;
- }
+ dm_free(dmt->uuid);
if (!(dmt->uuid = dm_strdup(uuid))) {
log_error("dm_task_set_uuid: strdup(%s) failed", uuid);
--
1.7.3.2
More information about the lvm-devel
mailing list