From a5aecede9626611c8fc375a7976ed69079e706ee Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Fri, 26 Jun 2020 12:44:48 +0200 Subject: Use some of the new list.h features in minecctl --- minecctl/minecctl-rcon.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'minecctl/minecctl-rcon.c') diff --git a/minecctl/minecctl-rcon.c b/minecctl/minecctl-rcon.c index b97e03e..6ef6cc1 100644 --- a/minecctl/minecctl-rcon.c +++ b/minecctl/minecctl-rcon.c @@ -239,10 +239,10 @@ do_status(struct cfg *cfg) { int fd; struct server *server; - if (list_empty(&cfg->servers)) + server = list_first_entry_or_null(&cfg->servers, struct server, list); + if (!server) die("No servers defined"); - server = list_first_entry(&cfg->servers, struct server, list); read_server_config(server); fd = rcon_login(cfg, server); @@ -321,10 +321,10 @@ do_stop(struct cfg *cfg) { int fd; struct server *server; - if (list_empty(&cfg->servers)) + server = list_first_entry_or_null(&cfg->servers, struct server, list); + if (!server) die("No servers defined"); - server = list_first_entry(&cfg->servers, struct server, list); read_server_config(server); fd = rcon_login(cfg, server); @@ -364,10 +364,10 @@ do_pcount(struct cfg *cfg) { unsigned current, max; struct server *server; - if (list_empty(&cfg->servers)) + server = list_first_entry_or_null(&cfg->servers, struct server, list); + if (!server) die("No servers defined"); - server = list_first_entry(&cfg->servers, struct server, list); read_server_config(server); fd = rcon_login(cfg, server); @@ -385,10 +385,10 @@ do_console(struct cfg *cfg) int fd; struct server *server; - if (list_empty(&cfg->servers)) + server = list_first_entry_or_null(&cfg->servers, struct server, list); + if (!server) die("No servers defined"); - server = list_first_entry(&cfg->servers, struct server, list); read_server_config(server); fd = rcon_login(cfg, server); @@ -431,10 +431,10 @@ do_command(struct cfg *cfg) { int fd; struct server *server; - if (list_empty(&cfg->servers)) + server = list_first_entry_or_null(&cfg->servers, struct server, list); + if (!server) die("No servers defined"); - server = list_first_entry(&cfg->servers, struct server, list); read_server_config(server); fd = rcon_login(cfg, server); send_cmd(fd, cfg->cmdstr); -- cgit v1.2.3