chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conf-parser: restrict .include usage
[elogind.git]
/
src
/
shared
/
install.c
diff --git
a/src/shared/install.c
b/src/shared/install.c
index 959de048103361bd5caa579f542202d58c82abc1..edf4d2a9fe979b8dbc4c7e09e05938a6655dea20 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-178,11
+178,9
@@
static int mark_symlink_for_removal(
path_kill_slashes(n);
path_kill_slashes(n);
- r = set_put(*remove_symlinks_to, n);
- if (r < 0) {
- free(n);
+ r = set_consume(*remove_symlinks_to, n);
+ if (r < 0)
return r == -EEXIST ? 0 : r;
return r == -EEXIST ? 0 : r;
- }
return 0;
}
return 0;
}
@@
-1017,7
+1015,7
@@
static int unit_file_load(
}
r = config_parse(NULL, path, f, NULL,
}
r = config_parse(NULL, path, f, NULL,
- config_item_table_lookup, (void*) items, true, info);
+ config_item_table_lookup, (void*) items, true,
true,
info);
if (r < 0)
return r;
if (r < 0)
return r;