The following commit has been merged in the next branch: commit 631d566dab8c0e1b9fc8baa8f12b69ee90da50a3 Author: Antonio Quartull ordex@autistici.org Date: Sun Nov 13 12:50:26 2011 +0100

batctl: correct batctl ll output

Since batctl has moved to a human-readable loglevel format, the 'batctl ll' output should be coherent to this change. This patch corrects it by substituting the numbers with the human-readable strings.

Signed-off-by: Antonio Quartull ordex@autistici.org

diff --git a/sys.c b/sys.c index bddaaa3..e510bee 100644 --- a/sys.c +++ b/sys.c @@ -237,14 +237,15 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)

log_level = strtol(line_ptr, (char **) NULL, 10);

- printf("[%c] %s (%d)\n", (!log_level) ? 'x' : ' ', - "all debug output disabled", 0); - printf("[%c] %s (%d)\n", (log_level & 1) ? 'x' : ' ', - "messages related to routing / flooding / broadcasting", 1); - printf("[%c] %s (%d)\n", (log_level & 2) ? 'x' : ' ', - "messages related to route added / changed / deleted", 2); - printf("[%c] %s (%d)\n", (log_level & 4) ? 'x' : ' ', - "messages related to translation table operations", 4); + printf("[%c] %s (%s)\n", (!log_level) ? 'x' : ' ', + "all debug output disabled", "none"); + printf("[%c] %s (%s)\n", (log_level & 1) ? 'x' : ' ', + "messages related to routing / flooding / broadcasting", + "batman"); + printf("[%c] %s (%s)\n", (log_level & 2) ? 'x' : ' ', + "messages related to route added / changed / deleted", "routes"); + printf("[%c] %s (%s)\n", (log_level & 4) ? 'x' : ' ', + "messages related to translation table operations", "tt");

out: if (errno == ENOENT)