chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-event: fix typo
[elogind.git]
/
src
/
cgls
/
cgls.c
diff --git
a/src/cgls/cgls.c
b/src/cgls/cgls.c
index 7fc346d6f5b62cc0730b57ff31610b1442da3430..c6f5485716962fc08390880508eb4e2e3c5e922e 100644
(file)
--- a/
src/cgls/cgls.c
+++ b/
src/cgls/cgls.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <limits.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
@@
-155,7
+154,7
@@
int main(int argc, char *argv[]) {
r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
if (r < 0) {
r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
if (r < 0) {
- log_error_errno(
-
r, "Failed to create bus connection: %m");
+ log_error_errno(r, "Failed to create bus connection: %m");
goto finish;
}
goto finish;
}
@@
-186,7
+185,7
@@
int main(int argc, char *argv[]) {
p = get_current_dir_name();
if (!p) {
p = get_current_dir_name();
if (!p) {
- log_error
(
"Cannot determine current working directory: %m");
+ log_error
_errno(errno,
"Cannot determine current working directory: %m");
goto finish;
}
goto finish;
}
@@
-203,10
+202,10
@@
int main(int argc, char *argv[]) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- m = str
append
a("/run/systemd/machines/", arg_machine);
+ m = str
join
a("/run/systemd/machines/", arg_machine);
r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL);
if (r < 0) {
r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL);
if (r < 0) {
- log_error_errno(
-
r, "Failed to get machine path: %m");
+ log_error_errno(r, "Failed to get machine path: %m");
goto finish;
}
goto finish;
}
@@
-246,8
+245,8
@@
int main(int argc, char *argv[]) {
} else
r = cg_get_root_path(&root);
if (r < 0) {
} else
r = cg_get_root_path(&root);
if (r < 0) {
- log_error
("Failed to get %s path: %s
",
-
arg_machine ? "machine" : "root", strerror(-r)
);
+ log_error
_errno(r, "Failed to get %s path: %m
",
+
arg_machine ? "machine" : "root"
);
goto finish;
}
goto finish;
}
@@
-257,7
+256,7
@@
int main(int argc, char *argv[]) {
}
if (r < 0) {
}
if (r < 0) {
- log_error_errno(
-
r, "Failed to list cgroup tree %s: %m", root);
+ log_error_errno(r, "Failed to list cgroup tree %s: %m", root);
retval = EXIT_FAILURE;
} else
retval = EXIT_SUCCESS;
retval = EXIT_FAILURE;
} else
retval = EXIT_SUCCESS;