From a6d421f99e90739e60a60232dbe5b09a53545978 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Fri, 26 Jun 2020 15:33:47 +0200 Subject: Rename shortname to name...to make it shorter --- minecctl/minecctl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'minecctl/minecctl.c') diff --git a/minecctl/minecctl.c b/minecctl/minecctl.c index 01f8163..19bcc1e 100644 --- a/minecctl/minecctl.c +++ b/minecctl/minecctl.c @@ -41,7 +41,7 @@ dump_config() list_for_each_entry(server, &cfg->servers, list) { info(" * server"); - info(" shortname : %s", server->shortname); + 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"); @@ -217,7 +217,7 @@ get_servers() suffix = strrchr(dent->d_name, '.'); assert_die(suffix, "Error parsing filename"); *suffix = '\0'; - server->shortname = xstrdup(dent->d_name); + server->name = xstrdup(dent->d_name); list_add(&server->list, &cfg->servers); } @@ -271,7 +271,7 @@ create_server_from_cmdline_args() if (!str_to_addrs(cfg->addrstr, &server->rcon_addrs)) goto error; - server->shortname = cfg->addrstr; + server->name = cfg->addrstr; cfg->addrstr = NULL; } @@ -279,8 +279,8 @@ create_server_from_cmdline_args() if (!str_to_addrs(cfg->mcaddrstr, &server->mc_addrs)) goto error; - if (!server->shortname) - server->shortname = cfg->mcaddrstr; + if (!server->name) + server->name = cfg->mcaddrstr; else xfree(cfg->mcaddrstr); @@ -297,7 +297,7 @@ create_server_from_cmdline_args() error: /* FIXME: free addrs */ - xfree(server->shortname); + xfree(server->name); xfree(server); return false; } @@ -308,7 +308,7 @@ do_list(struct cfg *cfg) struct server *server; list_for_each_entry(server, &cfg->servers, list) - info("%s", server->shortname); + info("%s", server->name); } static void @@ -319,7 +319,7 @@ set_server(const char *name) assert_die(cfg, "invalid arguments"); list_for_each_entry(server, &cfg->servers, list) { - if (streq(name, server->shortname)) { + if (streq(name, server->name)) { list_rotate_to_front(&server->list, &cfg->servers); return; } -- cgit v1.2.3