diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-02-11 05:48:10 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-02-12 03:05:08 +0900 |
| commit | b3f9c17a6b361bf98e79a0228cdcb09afc40d1cc (patch) | |
| tree | 1c607970840370d1588f41eb5e6387a240e08661 /src/cryptsetup/cryptsetup-generator.c | |
| parent | 7fb1d980aff8b035d96a34bd30efff261f3a5494 (diff) | |
| download | systemd-b3f9c17a6b361bf98e79a0228cdcb09afc40d1cc.tar.gz | |
tree-wide: use free_and_strdup_warn()
Diffstat (limited to 'src/cryptsetup/cryptsetup-generator.c')
| -rw-r--r-- | src/cryptsetup/cryptsetup-generator.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 0ae8ab35aa..74f739b513 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -667,7 +667,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat r = sscanf(value, "%m[0-9a-fA-F-]=%ms", &uuid, &uuid_value); if (r != 2) - return free_and_strdup(&arg_default_options, value) < 0 ? log_oom() : 0; + return free_and_strdup_warn(&arg_default_options, value); if (warn_uuid_invalid(uuid, key)) return 0; @@ -691,11 +691,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat return 0; n = strspn(value, ALPHANUMERICAL "-"); - if (value[n] != '=') { - if (free_and_strdup(&arg_default_keyfile, value) < 0) - return log_oom(); - return 0; - } + if (value[n] != '=') + return free_and_strdup_warn(&arg_default_keyfile, value); uuid = strndup(value, n); if (!uuid) |