chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
login
/
inhibit.c
diff --git
a/src/login/inhibit.c
b/src/login/inhibit.c
index 122c69d7a109527992feda7f91b4308458a4053a..fcc8d722359c00cde4d1199791dcb5f989f847dc 100644
(file)
--- a/
src/login/inhibit.c
+++ b/
src/login/inhibit.c
@@
-20,7
+20,6
@@
***/
#include <getopt.h>
***/
#include <getopt.h>
-#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
@@
-208,7
+207,7
@@
static int parse_argv(int argc, char *argv[]) {
assert_not_reached("Unhandled option");
}
assert_not_reached("Unhandled option");
}
- if (arg_action == ACTION_INHIBIT &&
argc == 1
)
+ if (arg_action == ACTION_INHIBIT &&
optind == argc
)
arg_action = ACTION_LIST;
else if (arg_action == ACTION_INHIBIT && optind >= argc) {
arg_action = ACTION_LIST;
else if (arg_action == ACTION_INHIBIT && optind >= argc) {
@@
-235,7
+234,7
@@
int main(int argc, char *argv[]) {
r = sd_bus_default_system(&bus);
if (r < 0) {
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error
("Failed to connect to bus: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to connect to bus: %m"
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-266,7
+265,7
@@
int main(int argc, char *argv[]) {
pid = fork();
if (pid < 0) {
pid = fork();
if (pid < 0) {
- log_error
(
"Failed to fork: %m");
+ log_error
_errno(errno,
"Failed to fork: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-276,11
+275,11
@@
int main(int argc, char *argv[]) {
close_all_fds(NULL, 0);
execvp(argv[optind], argv + optind);
close_all_fds(NULL, 0);
execvp(argv[optind], argv + optind);
- log_error
(
"Failed to execute %s: %m", argv[optind]);
+ log_error
_errno(errno,
"Failed to execute %s: %m", argv[optind]);
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
- r = wait_for_terminate_and_warn(argv[optind], pid);
+ r = wait_for_terminate_and_warn(argv[optind], pid
, true
);
return r < 0 ? EXIT_FAILURE : r;
}
return r < 0 ? EXIT_FAILURE : r;
}