diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2017-01-16 07:56:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 07:56:53 +0100 |
| commit | 8171bcc70f94a07fb59ba0a3bed2ca5c8af57bbb (patch) | |
| tree | 73f089c6430a77b42553356fb2c260690dba18ae /src/journal/journalctl.c | |
| parent | 74875a56cf5d7fd47190a78ec9fde71f72503ffe (diff) | |
| parent | e0489532fd5969be6e261a558cae91005820fc0e (diff) | |
Merge pull request #5085 from keszybz/variables
Fixes for gcc and coverity warnings
Diffstat (limited to 'src/journal/journalctl.c')
| -rw-r--r-- | src/journal/journalctl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 73204b3753..2a5f2b37e8 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -683,11 +683,12 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERIFY_KEY: arg_action = ACTION_VERIFY; - arg_verify_key = strdup(optarg); - if (!arg_verify_key) - return -ENOMEM; - arg_merge = false; + r = free_and_strdup(&arg_verify_key, optarg); + if (r < 0) + return r; string_erase(optarg); + + arg_merge = false; break; case ARG_INTERVAL: @@ -888,7 +889,7 @@ static int parse_argv(int argc, char *argv[]) { * to users, and automatically turn --unit= into --user-unit= if combined with --user. */ r = strv_extend_strv(&arg_user_units, arg_system_units, true); if (r < 0) - return -ENOMEM; + return r; arg_system_units = strv_free(arg_system_units); } |