From 112ab2c22f874550073ad4f2f8585d4d11751c31 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Thu, 4 Jan 2018 11:15:55 +0100 Subject: [PATCH] initctl: Refactor, use `struct command` rather than `command_t` Signed-off-by: Joachim Nilsson --- src/client.h | 5 ----- src/initctl.c | 9 +++++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client.h b/src/client.h index c2e00b6d..b56c7b2b 100644 --- a/src/client.h +++ b/src/client.h @@ -27,11 +27,6 @@ #include "finit.h" #include "svc.h" -typedef struct { - char *cmd; - int (*cb)(char *arg); -} command_t; - int client_connect (void); int client_disconnect (void); diff --git a/src/initctl.c b/src/initctl.c index 95a81361..9196c96f 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -43,6 +43,11 @@ #define _PATH_COND _PATH_VARRUN "finit/cond/" +struct command { + char *cmd; + int (*cb)(char *arg); +}; + int verbose = 0; int runlevel = 0; @@ -272,7 +277,7 @@ static int do_cond(char *cmd) { int c; char *arg; - command_t command[] = { + struct command command[] = { { "show", do_cond_show }, { "set", do_cond_set }, { "clear", do_cond_clear }, @@ -564,7 +569,7 @@ int main(int argc, char *argv[]) { int c; char *cmd, arg[120]; - command_t command[] = { + struct command command[] = { { "debug", toggle_debug }, { "help", do_help }, { "version", show_version },