chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve-host: use the usual log message when encountering a dbus parse failure
[elogind.git]
/
src
/
systemctl
/
systemctl.c
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index 0631190504f6e19591406735d5dcba402a1b4262..4699a670f7791ee1bf2b9ea0f14daca19fbcfcc9 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-1142,7
+1142,7
@@
static usec_t calc_next_elapse(dual_timestamp *nw, dual_timestamp *next) {
assert(nw);
assert(next);
assert(nw);
assert(next);
- if (next->monotonic !=
(usec_t) -1
&& next->monotonic > 0) {
+ if (next->monotonic !=
USEC_INFINITY
&& next->monotonic > 0) {
usec_t converted;
if (next->monotonic > nw->monotonic)
usec_t converted;
if (next->monotonic > nw->monotonic)
@@
-1150,7
+1150,7
@@
static usec_t calc_next_elapse(dual_timestamp *nw, dual_timestamp *next) {
else
converted = nw->realtime - (nw->monotonic - next->monotonic);
else
converted = nw->realtime - (nw->monotonic - next->monotonic);
- if (next->realtime !=
(usec_t) -1
&& next->realtime > 0)
+ if (next->realtime !=
USEC_INFINITY
&& next->realtime > 0)
next_elapse = MIN(converted, next->realtime);
else
next_elapse = converted;
next_elapse = MIN(converted, next->realtime);
else
next_elapse = converted;
@@
-4998,11
+4998,8
@@
static int enable_sysv_units(const char *verb, char **args) {
STRV_FOREACH(k, paths.unit_path) {
_cleanup_free_ char *path = NULL;
STRV_FOREACH(k, paths.unit_path) {
_cleanup_free_ char *path = NULL;
- if (!isempty(arg_root))
- j = asprintf(&path, "%s/%s/%s", arg_root, *k, name);
- else
- j = asprintf(&path, "%s/%s", *k, name);
- if (j < 0)
+ path = path_join(arg_root, *k, name);
+ if (!path)
return log_oom();
found_native = access(path, F_OK) >= 0;
return log_oom();
found_native = access(path, F_OK) >= 0;
@@
-5013,11
+5010,8
@@
static int enable_sysv_units(const char *verb, char **args) {
if (found_native)
continue;
if (found_native)
continue;
- if (!isempty(arg_root))
- j = asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/%s", arg_root, name);
- else
- j = asprintf(&p, SYSTEM_SYSVINIT_PATH "/%s", name);
- if (j < 0)
+ p = path_join(arg_root, SYSTEM_SYSVINIT_PATH, name);
+ if (!p)
return log_oom();
p[strlen(p) - strlen(".service")] = 0;
return log_oom();
p[strlen(p) - strlen(".service")] = 0;