From 2ca520b06a1a80497dd39c98533ae21c165752c2 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Wed, 1 Jul 2020 20:35:59 +0200
Subject: Some renaming for consistency and some quick FIXME fixes

---
 minecctl/misc.c   | 10 ----------
 minecctl/misc.h   |  2 --
 minecctl/server.c |  2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'minecctl')

diff --git a/minecctl/misc.c b/minecctl/misc.c
index c8e1d05..6562b14 100644
--- a/minecctl/misc.c
+++ b/minecctl/misc.c
@@ -195,16 +195,6 @@ char *ask_password()
 	return password;
 }
 
-void free_password(char **password)
-{
-	if (!password || !*password)
-		return;
-
-	explicit_bzero(*password, strlen(*password));
-	xfree(*password);
-	*password = NULL;
-}
-
 void __debug(_unused_ enum debug_lvl lvl, const char *fmt, ...)
 {
 	va_list ap;
diff --git a/minecctl/misc.h b/minecctl/misc.h
index 0c97ad4..f29422c 100644
--- a/minecctl/misc.h
+++ b/minecctl/misc.h
@@ -15,6 +15,4 @@ int connect_any(struct list_head *addrs, bool may_fail);
 
 char *ask_password();
 
-void free_password(char **password);
-
 #endif
diff --git a/minecctl/server.c b/minecctl/server.c
index 582c4fd..e7d9e7b 100644
--- a/minecctl/server.c
+++ b/minecctl/server.c
@@ -114,7 +114,7 @@ void server_load_all_known(struct cfg *cfg)
 		struct server *server;
 		char *suffix;
 
-		if (!is_valid_server_config_filename(dent, NULL))
+		if (!config_valid_server_filename(dent, NULL))
 			continue;
 
 		server = server_new(dent->d_name);
-- 
cgit v1.2.3