The following commit has been merged in the master branch: commit a9425b909950ec901a4677a4ca971ee4f836e7e6 Merge: d9ee7eed3175992be75e2cb949c048bdddeb0769 b320bf27babb12833777c8cc5e112c6ff18d42c4 Author: Marek Lindner lindner_marek@yahoo.de Date: Fri Jan 27 03:45:55 2012 +0800

Merge branch 'next'

diff --combined sys.c index 9cdccba,27f144a..0263ae7 --- a/sys.c +++ b/sys.c @@@ -1,5 -1,5 +1,5 @@@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner lindner_marek@yahoo.de * @@@ -187,7 -187,7 +187,7 @@@ static void log_level_usage(void

int handle_loglevel(char *mesh_iface, int argc, char **argv) { - int optchar, res; + int optchar, res = EXIT_FAILURE; int log_level = 0; char *path_buff; char str[4]; @@@ -221,8 -221,10 +221,10 @@@ log_level |= (1 << 1); else if (strcmp(argv[i], "tt") == 0) log_level |= (1 << 2); - else + else { log_level_usage(); + goto out; + } }

snprintf(str, sizeof(str), "%i", log_level);