picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tmpfiles: minor modernizations

This commit is contained in:
Lennart Poettering 2014-06-12 23:07:17 +02:00
parent 034753ac13
commit 753615e85d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tmpfiles/tmpfiles.c
View File

@ -1021,7 +1021,9 @@ static int process_item(Item *i) {
}
static void item_free(Item *i) {
assert(i);
if (!i)
return;
free(i->path);
free(i->argument);
@ -1150,7 +1152,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
}
switch(type) {
switch (type) {
case CREATE_FILE:
case TRUNCATE_FILE:
@ -1214,7 +1216,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
default:
log_error("[%s:%u] Unknown file type '%c'.", fname, line, type);
log_error("[%s:%u] Unknown command type '%c'.", fname, line, type);
return -EBADMSG;
}
@ -1413,9 +1415,11 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_ROOT:
free(arg_root);
arg_root = path_make_absolute_cwd(optarg);
if (!arg_root)
return log_oom();
path_kill_slashes(arg_root);
break;
@ -1513,7 +1517,7 @@ int main(int argc, char *argv[]) {
r = parse_argv(argc, argv);
if (r <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
goto finish;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();