From 9d303b37d73b8fe2bef310d8d9ca1acad23c2501 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sat, 22 Jul 2017 14:52:33 +0200 Subject: Revert "*: reindent pt. 2" This reverts commit c14777c6bfd0a446c85243d3a9835054a259c276. clang 5 is not widely available enough for people to indent with. This is particularly problematic when rebasing/adjusting branches. Signed-off-by: David Lamparter --- lib/command.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'lib/command.c') diff --git a/lib/command.c b/lib/command.c index d4b628ab02..d97ad9db3c 100644 --- a/lib/command.c +++ b/lib/command.c @@ -56,23 +56,19 @@ struct host host; /* Standard command node structures. */ static struct cmd_node auth_node = { - AUTH_NODE, - "Password: ", + AUTH_NODE, "Password: ", }; static struct cmd_node view_node = { - VIEW_NODE, - "%s> ", + VIEW_NODE, "%s> ", }; static struct cmd_node auth_enable_node = { - AUTH_ENABLE_NODE, - "Password: ", + AUTH_ENABLE_NODE, "Password: ", }; static struct cmd_node enable_node = { - ENABLE_NODE, - "%s# ", + ENABLE_NODE, "%s# ", }; static struct cmd_node config_node = {CONFIG_NODE, "%s(config)# ", 1}; @@ -653,9 +649,8 @@ void cmd_variable_complete(struct cmd_token *token, const char *arg, for (ALL_LIST_ELEMENTS_RO(varhandlers, ln, cvh)) { if (cvh->tokenname && strcmp(cvh->tokenname, token->text)) continue; - if (cvh->varname - && (!token->varname - || strcmp(cvh->varname, token->varname))) + if (cvh->varname && (!token->varname + || strcmp(cvh->varname, token->varname))) continue; cvh->completions(tmpcomps, token); break; @@ -1500,9 +1495,8 @@ DEFUN (config_write, struct stat conf_stat; // if command was 'write terminal' or 'show running-config' - if (argc == 2 - && (strmatch(argv[idx_type]->text, "terminal") - || strmatch(argv[0]->text, "show"))) { + if (argc == 2 && (strmatch(argv[idx_type]->text, "terminal") + || strmatch(argv[0]->text, "show"))) { vty_write_config(vty); return CMD_SUCCESS; } -- cgit v1.2.3