From f51ed1db70abdbb909e81bc670ffdfa05f421257 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 1 Mar 2018 15:00:27 +0100 Subject: cli: Drop pointless check in cli_append_multiline() The function is called from cli_complete after it has checked for line to be != NULL. The other part of the conditional, namely multiline being NULL, is perfectly valid (if the last read line didn't end with backslash. Hence drop the conditional completely. Since variable eof is not used anywhere outside of the dropped conditional, get rid of it completely. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/cli.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/cli.c b/src/cli.c index ec4d2a6f..eb60d01d 100644 --- a/src/cli.c +++ b/src/cli.c @@ -38,21 +38,13 @@ static struct nft_ctx *cli_nft; static char histfile[PATH_MAX]; static char *multiline; -static bool eof; static char *cli_append_multiline(char *line) { + size_t len = strlen(line); bool complete = false; - size_t len; char *s; - if (line == NULL && multiline == NULL) { - eof = true; - return NULL; - } - - len = strlen(line); - if (len == 0) return NULL; @@ -155,7 +147,7 @@ int cli_init(struct nft_ctx *nft) read_history(histfile); history_set_pos(history_length); - while (!eof) + while (true) rl_callback_read_char(); return 0; } -- cgit v1.2.3