jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dbus: Add "excessive" to debug_strings

Browse source 
The "debug_strings" private array in dbus_new_handles.c has fallen out
of sync with wpa_debug.h. Add the new "excessive" level to the head of
the list, realigning everything.

Signed-off-by: Paul Stewart <pstew@google.com>
This commit is contained in:
Paul Stewart 2011-03-31 17:38:08 +03:00 committed by Jouni Malinen
parent 72863ea7c6
commit 14dc00115e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -38,7 +38,7 @@ extern int wpa_debug_show_keys;
extern int wpa_debug_timestamp; extern int wpa_debug_timestamp;
static const char *debug_strings[] = { static const char *debug_strings[] = {
"msgdump", "debug", "info", "warning", "error", NULL "excessive", "msgdump", "debug", "info", "warning", "error", NULL
}; };
@ -741,8 +741,8 @@ DBusMessage * wpas_dbus_getter_debug_level(DBusMessage *message,
int idx = wpa_debug_level; int idx = wpa_debug_level;
if (idx < 0) if (idx < 0)
idx = 0; idx = 0;
if (idx > 4) if (idx > 5)
idx = 4; idx = 5;
str = debug_strings[idx]; str = debug_strings[idx];
return wpas_dbus_simple_property_getter(message, DBUS_TYPE_STRING, return wpas_dbus_simple_property_getter(message, DBUS_TYPE_STRING,
&str); &str);

3
wpa_supplicant/wpa_supplicant.c
View file

@ -1727,7 +1727,8 @@ int wpa_supplicant_set_debug_params(struct wpa_global *global, int debug_level,
int old_level, old_timestamp, old_show_keys; int old_level, old_timestamp, old_show_keys;
/* check for allowed debuglevels */ /* check for allowed debuglevels */
if (debug_level != MSG_MSGDUMP && if (debug_level != MSG_EXCESSIVE &&
debug_level != MSG_MSGDUMP &&
debug_level != MSG_DEBUG && debug_level != MSG_DEBUG &&
debug_level != MSG_INFO && debug_level != MSG_INFO &&
debug_level != MSG_WARNING && debug_level != MSG_WARNING &&