From 8586a88abbe22161244f5082b59c10a471c876be Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 26 Jan 2023 10:53:47 -0500 Subject: [PATCH] lib: Remove global variable exposure `struct host host` This was only used in one place and we have accessor functions now. So let's use them. Signed-off-by: Donald Sharp --- lib/command.h | 3 --- lib/grammar_sandbox_main.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/command.h b/lib/command.h index bce4fb9e1c..8f5d96053c 100644 --- a/lib/command.h +++ b/lib/command.h @@ -619,9 +619,6 @@ extern void print_version(const char *); extern int cmd_banner_motd_file(const char *); extern void cmd_banner_motd_line(const char *line); -/* struct host global, ick */ -extern struct host host; - struct cmd_variable_handler { const char *tokenname, *varname; void (*completions)(vector out, struct cmd_token *token); diff --git a/lib/grammar_sandbox_main.c b/lib/grammar_sandbox_main.c index 6469b49262..a7d6c51376 100644 --- a/lib/grammar_sandbox_main.c +++ b/lib/grammar_sandbox_main.c @@ -49,8 +49,8 @@ int main(int argc, char **argv) /* Library inits. */ cmd_init(1); - host.name = strdup("test"); - host.domainname = strdup("testdomainname"); + cmd_hostname_set("test"); + cmd_domainname_set("testdomainname"); vty_init(master, true); lib_cmd_init();