diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2019-11-14 17:17:09 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2019-11-14 18:06:42 +0100 |
| commit | 1760b96368ae41e76e89a7064254f995713a41e5 (patch) | |
| tree | 601af2597b634b98ab2b4b189b3ab95ac7e9e2ed | |
| parent | 9af1d63b4d96facb0aa055a44c2f61eac01e13f2 (diff) | |
| download | lvm2-1760b96368ae41e76e89a7064254f995713a41e5.tar.gz | |
hints: no need to check for NULL before free
free() itself checks for NULL.
| -rw-r--r-- | lib/label/hints.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/label/hints.c b/lib/label/hints.c index c6039d555..ac2c0895b 100644 --- a/lib/label/hints.c +++ b/lib/label/hints.c @@ -688,13 +688,11 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int * _filter_to_str(cmd, devices_global_filter_CFG, &filter_str); if (!filter_str || strcmp(filter_str, _hint_line + keylen)) { log_debug("ignore hints with different global_filter"); - if (filter_str) - free(filter_str); + free(filter_str); *needs_refresh = 1; break; } - if (filter_str) - free(filter_str); + free(filter_str); continue; } @@ -703,13 +701,11 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int * _filter_to_str(cmd, devices_filter_CFG, &filter_str); if (!filter_str || strcmp(filter_str, _hint_line + keylen)) { log_debug("ignore hints with different filter"); - if (filter_str) - free(filter_str); + free(filter_str); *needs_refresh = 1; break; } - if (filter_str) - free(filter_str); + free(filter_str); continue; } @@ -907,13 +903,11 @@ int write_hint_file(struct cmd_context *cmd, int newhints) _filter_to_str(cmd, devices_global_filter_CFG, &filter_str); fprintf(fp, "global_filter:%s\n", filter_str ?: "-"); - if (filter_str) - free(filter_str); + free(filter_str); _filter_to_str(cmd, devices_filter_CFG, &filter_str); fprintf(fp, "filter:%s\n", filter_str ?: "-"); - if (filter_str) - free(filter_str); + free(filter_str); fprintf(fp, "scan_lvs:%d\n", cmd->scan_lvs); |