commit 2d1a9fabcc9fb394fee6a857de797fe802fa4291
author Vadim Yanitskiy <vyanitskiy@sysmocom.de> Mon Apr 05 03:08:26 2021 +0200
committer laforge <laforge@osmocom.org> Wed Apr 07 16:33:18 2021 +0000
tree b799b7e1a788960a179e533b139b5e66b5f70142
parent ad34465349bdc40e30047122ac3f61ed118952ff

vty/logging: ensure consistent '%' prefix for warnings

Change-Id: I2b2bab61e46668c3b4b0ccad88d02b6d00a83544

src/vty/logging_vty.c

diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index cc250c0..5f31b39 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -131,7 +131,7 @@
 
 	conn = (struct telnet_connection *) vty->priv;
 	if (conn->dbg) {
-		vty_out(vty, "Logging already enabled.%s", VTY_NEWLINE);
+		vty_out(vty, "%% Logging already enabled.%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -158,7 +158,7 @@
 
 	conn = (struct telnet_connection *) vty->priv;
 	if (!conn->dbg)
-		vty_out(vty, "Logging was not enabled.%s", VTY_NEWLINE);
+		vty_out(vty, "%% Logging was not enabled.%s", VTY_NEWLINE);
 
 	return conn->dbg;
 }
@@ -372,12 +372,12 @@
 	int level = log_parse_level(argv[1]);
 
 	if (level < 0) {
-		vty_out(vty, "Invalid level '%s'%s", argv[1], VTY_NEWLINE);
+		vty_out(vty, "%% Invalid level '%s'%s", argv[1], VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	if (category < 0) {
-		vty_out(vty, "Invalid category '%s'%s", argv[0], VTY_NEWLINE);
+		vty_out(vty, "%% Invalid category '%s'%s", argv[0], VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -595,7 +595,7 @@
 	char **dptr = vty->index_sub;
 
 	if (!dptr) {
-		vty_out(vty, "vty->index_sub == NULL%s", VTY_NEWLINE);
+		vty_out(vty, "%% vty->index_sub == NULL%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -616,7 +616,7 @@
 	char **dptr = vty->index_sub;
 
 	if (!dptr) {
-		vty_out(vty, "vty->index_sub == NULL%s", VTY_NEWLINE);
+		vty_out(vty, "%% vty->index_sub == NULL%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 

tests/logging/logging_vty_test.vty

diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty
index 91c2a48..30e73ab 100644
--- a/tests/logging/logging_vty_test.vty
+++ b/tests/logging/logging_vty_test.vty
@@ -29,7 +29,7 @@
 logging_vty_test(config)# exit
 
 logging_vty_test# logging level force-all notice
-Logging was not enabled.
+% Logging was not enabled.
 
 logging_vty_test# logging enable
 logging_vty_test# logging filter all 1