chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
condition: properly allow passing back errors from condition checks
[elogind.git]
/
src
/
core
/
automount.c
diff --git
a/src/core/automount.c
b/src/core/automount.c
index 65e6d6f179219aba14996e61b9f59c226e9e021b..f72aca29579aea9bf61f5a9a3d25df329c88e536 100644
(file)
--- a/
src/core/automount.c
+++ b/
src/core/automount.c
@@
-144,7
+144,7
@@
static int automount_add_default_dependencies(Automount *a) {
static int automount_verify(Automount *a) {
bool b;
static int automount_verify(Automount *a) {
bool b;
-
char *e
;
+
_cleanup_free_ char *e = NULL
;
assert(a);
if (UNIT(a)->load_state != UNIT_LOADED)
assert(a);
if (UNIT(a)->load_state != UNIT_LOADED)
@@
-160,7
+160,6
@@
static int automount_verify(Automount *a) {
return -ENOMEM;
b = unit_has_name(UNIT(a), e);
return -ENOMEM;
b = unit_has_name(UNIT(a), e);
- free(e);
if (!b) {
log_error_unit(UNIT(a)->id, "%s's Where setting doesn't match unit name. Refusing.", UNIT(a)->id);
if (!b) {
log_error_unit(UNIT(a)->id, "%s's Where setting doesn't match unit name. Refusing.", UNIT(a)->id);
@@
-686,7
+685,7
@@
static int automount_deserialize_item(Unit *u, const char *key, const char *valu
log_debug_unit(u->id, "Failed to parse token value %s", value);
else {
if (!a->tokens)
log_debug_unit(u->id, "Failed to parse token value %s", value);
else {
if (!a->tokens)
- if (!(a->tokens = set_new(
trivial_hash_func, trivial_compare_func
)))
+ if (!(a->tokens = set_new(
NULL
)))
return -ENOMEM;
r = set_put(a->tokens, UINT_TO_PTR(token));
return -ENOMEM;
r = set_put(a->tokens, UINT_TO_PTR(token));
@@
-763,7
+762,7
@@
static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
} else
log_debug_unit(UNIT(a)->id, "Got direct mount request on %s", a->where);
} else
log_debug_unit(UNIT(a)->id, "Got direct mount request on %s", a->where);
- r = set_ensure_allocated(&a->tokens,
trivial_hash_func, trivial_compare_func
);
+ r = set_ensure_allocated(&a->tokens,
NULL
);
if (r < 0) {
log_error_unit(UNIT(a)->id, "Failed to allocate token set.");
goto fail;
if (r < 0) {
log_error_unit(UNIT(a)->id, "Failed to allocate token set.");
goto fail;