chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: rework unit name validation and manipulation logic
[elogind.git]
/
src
/
shared
/
generator.c
diff --git
a/src/shared/generator.c
b/src/shared/generator.c
index 569b25bb7c882ded2e3863ec6b7fd4a0d2826f98..8f48ac4fee23d23c7997cf725cc7fd3bcecdeccc 100644
(file)
--- a/
src/shared/generator.c
+++ b/
src/shared/generator.c
@@
-37,6
+37,8
@@
int generator_write_fsck_deps(
const char *where,
const char *fstype) {
const char *where,
const char *fstype) {
+ int r;
+
assert(f);
assert(dest);
assert(what);
assert(f);
assert(dest);
assert(what);
@@
-48,7
+50,6
@@
int generator_write_fsck_deps(
}
if (!isempty(fstype) && !streq(fstype, "auto")) {
}
if (!isempty(fstype) && !streq(fstype, "auto")) {
- int r;
r = fsck_exists(fstype);
if (r == -ENOENT) {
/* treat missing check as essentially OK */
r = fsck_exists(fstype);
if (r == -ENOENT) {
/* treat missing check as essentially OK */
@@
-70,9
+71,9
@@
int generator_write_fsck_deps(
} else {
_cleanup_free_ char *fsck = NULL;
} else {
_cleanup_free_ char *fsck = NULL;
-
fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"
);
- if (
!fsck
)
- return log_
oom(
);
+
r = unit_name_from_path_instance("systemd-fsck", what, ".service", &fsck
);
+ if (
r < 0
)
+ return log_
error_errno(r, "Failed to create fsck service name: %m"
);
fprintf(f,
"RequiresOverridable=%s\n"
fprintf(f,
"RequiresOverridable=%s\n"
@@
-103,8
+104,7
@@
int generator_write_timeouts(const char *dir, const char *what, const char *wher
r = parse_sec(timeout, &u);
if (r < 0) {
r = parse_sec(timeout, &u);
if (r < 0) {
- log_warning("Failed to parse timeout for %s, ignoring: %s",
- where, timeout);
+ log_warning("Failed to parse timeout for %s, ignoring: %s", where, timeout);
return 0;
}
return 0;
}
@@
-112,9
+112,9
@@
int generator_write_timeouts(const char *dir, const char *what, const char *wher
if (!node)
return log_oom();
if (!node)
return log_oom();
-
unit = unit_name_from_path(node, ".device"
);
- if (
!unit
)
- return log_
oom(
);
+
r = unit_name_from_path(node, ".device", &unit
);
+ if (
r < 0
)
+ return log_
error_errno(r, "Failed to make unit name from path: %m"
);
return write_drop_in_format(dir, unit, 50, "device-timeout",
"# Automatically generated by %s\n\n"
return write_drop_in_format(dir, unit, 50, "device-timeout",
"# Automatically generated by %s\n\n"