diff options
| author | Roy Marples <roy@marples.name> | 2008-03-17 09:59:52 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-17 09:59:52 +0000 |
| commit | 50a7697bf207e4919ce893bfc1604fd3a9d807de (patch) | |
| tree | 1a9c9debaa4d5d862f42c8015826d35b0ce26d7c /src/rc/rc.c | |
| parent | 40930d7d0a613aaf6fa124a5963afcae0c30ce7a (diff) | |
| download | openrc-50a7697bf207e4919ce893bfc1604fd3a9d807de.tar.gz openrc-50a7697bf207e4919ce893bfc1604fd3a9d807de.tar.bz2 openrc-50a7697bf207e4919ce893bfc1604fd3a9d807de.tar.xz | |
rc_find_pids now returns RC_PIDLIST instead of a NULL terminated array.
Diffstat (limited to 'src/rc/rc.c')
| -rw-r--r-- | src/rc/rc.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/rc/rc.c b/src/rc/rc.c index 6754d2d..d906870 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -99,12 +99,7 @@ static RC_HOOK hook_out = 0; struct termios *termios_orig = NULL; -typedef struct piditem -{ - pid_t pid; - LIST_ENTRY(piditem) entries; -} PIDITEM; -LIST_HEAD(, piditem) service_pids; +RC_PIDLIST service_pids; static void clean_failed(void) { @@ -138,8 +133,8 @@ static void clean_failed(void) static void cleanup(void) { if (applet && strcmp(applet, "rc") == 0) { - PIDITEM *p1 = LIST_FIRST(&service_pids); - PIDITEM *p2; + RC_PID *p1 = LIST_FIRST(&service_pids); + RC_PID *p2; if (hook_out) rc_plugin_run(hook_out, runlevel); @@ -410,14 +405,14 @@ static int get_ksoftlevel(char *buffer, int buffer_len) static void add_pid(pid_t pid) { - PIDITEM *p = xmalloc(sizeof(*p)); + RC_PID *p = xmalloc(sizeof(*p)); p->pid = pid; LIST_INSERT_HEAD(&service_pids, p, entries); } static void remove_pid(pid_t pid) { - PIDITEM *p; + RC_PID *p; LIST_FOREACH(p, &service_pids, entries) if (p->pid == pid) { @@ -437,7 +432,7 @@ static void handle_signal(int sig) int serrno = errno; char signame[10] = { '\0' }; pid_t pid; - PIDITEM *pi; + RC_PID *pi; int status = 0; struct winsize ws; sigset_t sset; |