diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-09 09:57:29 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-09 09:57:29 +0200 |
| commit | 0fa7d1f5be847d4804eb3bf6a4c10333ea14e0bc (patch) | |
| tree | 6afb70cc560bd94219f81495ff699c83b404e18c /src/core/main.c | |
| parent | bed2c013b6570908a114a337632000cf9c9de838 (diff) | |
| parent | ece174c5439021e32ebcc858842de9586072c006 (diff) | |
Merge pull request #1207 from poettering/coccinelle-fixes
Coccinelle fixes
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/main.c b/src/core/main.c index fe8f1924bd..9aaf244e71 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1204,12 +1204,11 @@ static int status_welcome(void) { "PRETTY_NAME", &pretty_name, "ANSI_COLOR", &ansi_color, NULL); - if (r == -ENOENT) { + if (r == -ENOENT) r = parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &pretty_name, "ANSI_COLOR", &ansi_color, NULL); - } if (r < 0 && r != -ENOENT) log_warning_errno(r, "Failed to read os-release file: %m"); @@ -1843,8 +1842,7 @@ finish: m = manager_free(m); for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) { - free(arg_default_rlimit[j]); - arg_default_rlimit[j] = NULL; + arg_default_rlimit[j] = mfree(arg_default_rlimit[j]); } arg_default_unit = mfree(arg_default_unit); |