chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd-dhcp6: Support ICMPv6 Other information
[elogind.git]
/
src
/
analyze
/
analyze-verify.c
diff --git
a/src/analyze/analyze-verify.c
b/src/analyze/analyze-verify.c
index a0f33cbcc2ca8a18785f9e64736520f04c5f12bf..f56910926808ae5cd79c0ecb78388a91d321e5a6 100644
(file)
--- a/
src/analyze/analyze-verify.c
+++ b/
src/analyze/analyze-verify.c
@@
-221,24
+221,20
@@
int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
/* set the path */
r = generate_path(&var, filenames);
/* set the path */
r = generate_path(&var, filenames);
- if (r < 0) {
- log_error_errno(-r, "Failed to generate unit load path: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to generate unit load path: %m");
assert_se(set_unit_path(var) >= 0);
r = manager_new(running_as, true, &m);
assert_se(set_unit_path(var) >= 0);
r = manager_new(running_as, true, &m);
- if (r < 0) {
- log_error_errno(-r, "Failed to initalize manager: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to initalize manager: %m");
log_debug("Starting manager...");
r = manager_startup(m, serial, fdset);
if (r < 0) {
log_debug("Starting manager...");
r = manager_startup(m, serial, fdset);
if (r < 0) {
- log_error_errno(
-
r, "Failed to start manager: %m");
+ log_error_errno(r, "Failed to start manager: %m");
goto finish;
}
goto finish;
}
@@
-260,7
+256,7
@@
int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
} else
k = manager_load_unit(m, NULL, *filename, &err, &units[count]);
if (k < 0) {
} else
k = manager_load_unit(m, NULL, *filename, &err, &units[count]);
if (k < 0) {
- log_error_errno(
-
k, "Failed to load %s: %m", *filename);
+ log_error_errno(k, "Failed to load %s: %m", *filename);
if (r == 0)
r = k;
} else
if (r == 0)
r = k;
} else