diff options
Diffstat (limited to 'minecctl/minecctl.c')
| -rw-r--r-- | minecctl/minecctl.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/minecctl/minecctl.c b/minecctl/minecctl.c index b93f87b..5ac3942 100644 --- a/minecctl/minecctl.c +++ b/minecctl/minecctl.c @@ -22,8 +22,7 @@ #include "config-parser.h" #include "config.h" -static void -dump_config(struct cfg *cfg) +static void dump_config(struct cfg *cfg) { /* FIXME: return unless debugging enabled */ struct server *server; @@ -44,7 +43,8 @@ dump_config(struct cfg *cfg) info(" name : %s", server->name); info(" filename : %s", server->filename); info(" rcon_password : %s", server->rcon_password); - info(" file_read : %s", server->file_read ? "yes" : "no"); + info(" file_read : %s", + server->file_read ? "yes" : "no"); list_for_each_entry(saddr, &server->rcon_addrs, list) info(" * rcon addr : %s", saddr->addrstr); list_for_each_entry(saddr, &server->mc_addrs, list) @@ -54,8 +54,7 @@ dump_config(struct cfg *cfg) info("============="); } -_noreturn_ static void -usage(bool no_error) +_noreturn_ static void usage(bool no_error) { info("Usage: %s [OPTION...] COMMAND\n" "\n" @@ -92,8 +91,7 @@ usage(bool no_error) exit(no_error ? EXIT_FAILURE : EXIT_SUCCESS); } -static bool -str_to_addrs(const char *str, struct list_head *list) +static bool str_to_addrs(const char *str, struct list_head *list) { struct cfg_value value; char *tmp = NULL; @@ -124,8 +122,7 @@ out: return rv; } -static bool -create_server_from_cmdline_args(struct cfg *cfg) +static bool create_server_from_cmdline_args(struct cfg *cfg) { struct server *server; @@ -167,8 +164,8 @@ error: return false; } -static inline void -get_optional_server_arg(struct cfg *cfg, char * const **argv, bool more) +static inline void get_optional_server_arg(struct cfg *cfg, char *const **argv, + bool more) { if (!cfg->rcon_addrstr) { if (!**argv) { @@ -177,7 +174,8 @@ get_optional_server_arg(struct cfg *cfg, char * const **argv, bool more) } if (!server_set_default(cfg, **argv)) { - error("\"%s\" is not a known server or command", **argv); + error("\"%s\" is not a known server or command", + **argv); usage(false); } @@ -190,8 +188,7 @@ get_optional_server_arg(struct cfg *cfg, char * const **argv, bool more) } } -static void -parse_command(struct cfg *cfg, char * const *argv) +static void parse_command(struct cfg *cfg, char *const *argv) { enum commands cmd = CMD_INVALID; @@ -280,8 +277,7 @@ parse_command(struct cfg *cfg, char * const *argv) } } -static void -parse_cmdline(struct cfg *cfg, int argc, char * const *argv) +static void parse_cmdline(struct cfg *cfg, int argc, char *const *argv) { int c; char *e; @@ -299,6 +295,7 @@ parse_cmdline(struct cfg *cfg, int argc, char * const *argv) while (true) { int option_index = 0; + /* clang-format off */ static struct option long_options[] = { { "rcon-password", required_argument, 0, 'p' }, { "rcon-address", required_argument, 0, 'r' }, @@ -309,9 +306,10 @@ parse_cmdline(struct cfg *cfg, int argc, char * const *argv) { "help", no_argument, 0, 'h' }, { 0, 0, 0, 0 } }; + /* clang-format on */ - c = getopt_long(argc, argv, ":p:r:m:c:vfh", - long_options, &option_index); + c = getopt_long(argc, argv, ":p:r:m:c:vfh", long_options, + &option_index); if (c == -1) break; @@ -362,8 +360,7 @@ parse_cmdline(struct cfg *cfg, int argc, char * const *argv) } } -int -main(int argc, char **argv) +int main(int argc, char **argv) { struct cfg cfg = { .servers = LIST_HEAD_INIT(cfg.servers), @@ -401,4 +398,3 @@ out: xfree(cfg.cmdstr); exit(success ? EXIT_SUCCESS : EXIT_FAILURE); } - |