lib: rename memory_vty.c to lib_vty.c

And memory_init() to lib_cmd_init().

Signed-off-by: David Lamparter <equinox@diac24.net>

6 files changed, 11 insertions, 11 deletions

diff --git a/tests/helpers/c/main.c b/tests/helpers/c/main.c
index b1dcfcf70..2de29cbdb 100644
--- a/tests/helpers/c/main.c
+++ b/tests/helpers/c/main.c
@@ -24,7 +24,7 @@
 #include "vty.h"
 #include "command.h"
 #include "memory.h"
-#include "memory_vty.h"
+#include "lib_vty.h"
 
 extern void test_init(void);
 
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 	/* Library inits. */
 	cmd_init(1);
 	vty_init(master, false);
-	memory_init();
+	lib_cmd_init();
 	yang_init();
 	nb_init(master, NULL, 0);
 
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 2071ae08c..e091372ab 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -25,7 +25,7 @@
 #include "vty.h"
 #include "command.h"
 #include "memory.h"
-#include "memory_vty.h"
+#include "lib_vty.h"
 #include "log.h"
 
 #include "common_cli.h"
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 	cmd_domainname_set("test.domain");
 
 	vty_init(master, false);
-	memory_init();
+	lib_cmd_init();
 	yang_init();
 	nb_init(master, NULL, 0);
 
diff --git a/tests/lib/cxxcompat.c b/tests/lib/cxxcompat.c
index 88126e84b..391ccd926 100644
--- a/tests/lib/cxxcompat.c
+++ b/tests/lib/cxxcompat.c
@@ -51,13 +51,13 @@
 #include "lib/json.h"
 #include "lib/keychain.h"
 #include "lib/lib_errors.h"
+#include "lib/lib_vty.h"
 #include "lib/libfrr.h"
 #include "lib/libospf.h"
 #include "lib/linklist.h"
 #include "lib/log.h"
 #include "lib/md5.h"
 #include "lib/memory.h"
-#include "lib/memory_vty.h"
 #include "lib/mlag.h"
 #include "lib/module.h"
 #include "lib/monotime.h"
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index a28830e08..18d318088 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -23,7 +23,7 @@
 #include "vty.h"
 #include "command.h"
 #include "memory.h"
-#include "memory_vty.h"
+#include "lib_vty.h"
 #include "log.h"
 #include "northbound.h"
 
@@ -412,7 +412,7 @@ int main(int argc, char **argv)
 	cmd_init(1);
 	cmd_hostname_set("test");
 	vty_init(master, false);
-	memory_init();
+	lib_cmd_init();
 	yang_init();
 	nb_init(master, modules, array_size(modules));
 
diff --git a/tests/lib/test_buffer.c b/tests/lib/test_buffer.c
index b56cc30cf..7fb9a769d 100644
--- a/tests/lib/test_buffer.c
+++ b/tests/lib/test_buffer.c
@@ -20,7 +20,7 @@
 
 #include <zebra.h>
 #include <memory.h>
-#include <memory_vty.h>
+#include <lib_vty.h>
 #include <buffer.h>
 
 struct thread_master *master;
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
 	char junk[3];
 	char c = 'a';
 
-	memory_init();
+	lib_cmd_init();
 
 	if ((argc != 2) || (sscanf(argv[1], "%d%1s", &n, junk) != 1)) {
 		fprintf(stderr, "Usage: %s <number of chars to simulate>\n",
diff --git a/tests/lib/test_privs.c b/tests/lib/test_privs.c
index de638bc67..c06ebbeb3 100644
--- a/tests/lib/test_privs.c
+++ b/tests/lib/test_privs.c
@@ -22,7 +22,7 @@
 #include "getopt.h"
 #include "privs.h"
 #include "memory.h"
-#include "memory_vty.h"
+#include "lib_vty.h"
 
 zebra_capabilities_t _caps_p[] = {
 	ZCAP_NET_RAW, ZCAP_BIND, ZCAP_NET_ADMIN, ZCAP_DAC_OVERRIDE,
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
 	}
 
 	/* Library inits. */
-	memory_init();
+	lib_cmd_init();
 	zprivs_preinit(&test_privs);
 	zprivs_init(&test_privs);