chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: add new --personality= switch to make it easier to run 32bit containers on...
[elogind.git]
/
src
/
core
/
killall.c
diff --git
a/src/core/killall.c
b/src/core/killall.c
index a7828dc0477e8b6d5d3b2e3f6f17a9c53820904d..57ed41c5afe4d2eb62e3adb20562a65f9de10e24 100644
(file)
--- a/
src/core/killall.c
+++ b/
src/core/killall.c
@@
-33,7
+33,8
@@
static bool ignore_proc(pid_t pid) {
_cleanup_fclose_ FILE *f = NULL;
static bool ignore_proc(pid_t pid) {
_cleanup_fclose_ FILE *f = NULL;
- char c, *p;
+ char c;
+ const char *p;
size_t count;
uid_t uid;
int r;
size_t count;
uid_t uid;
int r;
@@
-170,12
+171,12
@@
static int killall(int sig, Set *pids, bool send_sighup) {
_cleanup_free_ char *s;
get_process_comm(pid, &s);
_cleanup_free_ char *s;
get_process_comm(pid, &s);
- log_notice("Sending SIGKILL to PID
%lu (%s).", (unsigned long)
pid, strna(s));
+ log_notice("Sending SIGKILL to PID
"PID_FMT" (%s).",
pid, strna(s));
}
if (kill(pid, sig) >= 0) {
if (pids)
}
if (kill(pid, sig) >= 0) {
if (pids)
- set_put(pids, ULONG_TO_PTR(
(unsigned long)
pid));
+ set_put(pids, ULONG_TO_PTR(pid));
} else if (errno != ENOENT)
log_warning("Could not kill %d: %m", pid);
} else if (errno != ENOENT)
log_warning("Could not kill %d: %m", pid);
@@
-199,7
+200,7
@@
static int killall(int sig, Set *pids, bool send_sighup) {
return set_size(pids);
}
return set_size(pids);
}
-void broadcast_signal(int sig, bool
send_sighup, bool wait_for_exit
) {
+void broadcast_signal(int sig, bool
wait_for_exit, bool send_sighup
) {
sigset_t mask, oldmask;
Set *pids = NULL;
sigset_t mask, oldmask;
Set *pids = NULL;