summaryrefslogtreecommitdiff
path: root/initd
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-03-25 12:14:06 +0200
committerDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-03-25 12:14:06 +0200
commita71c92b33dc69bc6cbc5eae161f82a5bca27a82f (patch)
tree917eaeb4b2460345e122a00cbc32c7398f438d39 /initd
parenta108beaaf7b19198acbcc5435708d4ff0c8fb5df (diff)
Unify naming of service to shorthand svc
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'initd')
-rw-r--r--initd/main.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/initd/main.c b/initd/main.c
index be9fc0d..d3e22b6 100644
--- a/initd/main.c
+++ b/initd/main.c
@@ -39,14 +39,14 @@ static void handle_exited(service_t *svc)
switch (svc->type) {
case SVC_RESPAWN:
if (target == TGT_REBOOT || target == TGT_SHUTDOWN) {
- delsrv(svc);
+ delsvc(svc);
break;
}
svc->pid = runlst(svc->exec, svc->num_exec, svc->ctty);
if (svc->pid == -1) {
print_status(svc->desc, STATUS_FAIL, false);
- delsrv(svc);
+ delsvc(svc);
}
svclist_add(svc);
@@ -57,7 +57,7 @@ static void handle_exited(service_t *svc)
STATUS_OK : STATUS_FAIL, false);
/* fall-through */
default:
- delsrv(svc);
+ delsvc(svc);
break;
}
}
@@ -107,7 +107,7 @@ static void start_runlevel(int level)
if (!svc->num_exec) {
print_status(svc->desc, STATUS_OK, false);
- delsrv(svc);
+ delsvc(svc);
continue;
}
@@ -121,12 +121,12 @@ static void start_runlevel(int level)
status == EXIT_SUCCESS ?
STATUS_OK : STATUS_FAIL,
true);
- delsrv(svc);
+ delsvc(svc);
} else {
svc->pid = runlst(svc->exec, svc->num_exec, svc->ctty);
if (svc->pid == -1) {
print_status(svc->desc, STATUS_FAIL, false);
- delsrv(svc);
+ delsvc(svc);
continue;
}
@@ -196,7 +196,7 @@ int main(void)
if (reboot(LINUX_REBOOT_CMD_CAD_OFF))
perror("cannot disable CTRL+ALT+DEL");
- if (srvscan(SVCDIR, &cfg)) {
+ if (svcscan(SVCDIR, &cfg)) {
fputs("Error reading service list from " SVCDIR "\n"
"Trying to continue anyway\n", stderr);
}