Declare wpa_debug_* variables in src/utils/wpa_debug.h

These were somewhat more hidden to avoid direct use, but there are now numerous places where these are needed and more justification to make the extern int declarations available from wpa_debug.h. In addition, this avoids some warnings from sparse. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-31 19:29:52 +02:00 · 2013-12-31 19:29:52 +02:00 · 0187c41d88
commit 0187c41d88
parent fcc61230d1
27 changed files with 4 additions and 73 deletions
--- a/eap_example/eap_example.c
+++ b/eap_example/eap_example.c
@ -23,8 +23,6 @@ void eap_example_server_deinit(void);
 int eap_example_server_step(void);


-extern int wpa_debug_level;
-
 int main(int argc, char *argv[])
 {
 	int res_s, res_p;
--- a/hostapd/main.c
+++ b/hostapd/main.c
@ -29,11 +29,6 @@
 #include "ctrl_iface.h"


-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-extern int wpa_debug_timestamp;
-
-
 struct hapd_global {
 	void **drv_priv;
 	size_t drv_count;
--- a/radius_example/radius_example.c
+++ b/radius_example/radius_example.c
@ -13,8 +13,6 @@
 #include "radius/radius.h"
 #include "radius/radius_client.h"

-extern int wpa_debug_level;
-
 struct radius_ctx {
 	struct radius_client_data *radius;
 	struct hostapd_radius_servers conf;
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@ -41,8 +41,6 @@ static int hostapd_broadcast_wep_clear(struct hostapd_data *hapd);
 static int setup_interface2(struct hostapd_iface *iface);
 static void channel_list_update_timeout(void *eloop_ctx, void *timeout_ctx);

-extern int wpa_debug_level;
-

 int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
 			       int (*cb)(struct hostapd_iface *iface,
--- a/src/crypto/tls_gnutls.c
+++ b/src/crypto/tls_gnutls.c
@ -125,8 +125,6 @@ static void tls_log_func(int level, const char *msg)
 }


-extern int wpa_debug_show_keys;
-
 void * tls_init(const struct tls_config *conf)
 {
 	struct tls_global *global;
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@ -2901,7 +2901,6 @@ int tls_connection_get_write_alerts(void *ssl_ctx, struct tls_connection *conn)
 static void ocsp_debug_print_resp(OCSP_RESPONSE *rsp)
 {
 #ifndef CONFIG_NO_STDOUT_DEBUG
-	extern int wpa_debug_level;
 	BIO *out;
 	size_t rlen;
 	char *txt;
--- a/src/radius/radius_das.c
+++ b/src/radius/radius_das.c
@ -16,9 +16,6 @@
 #include "radius_das.h"


-extern int wpa_debug_level;
-
-
 struct radius_das_data {
 	int sock;
 	u8 *shared_secret;
--- a/src/radius/radius_server.c
+++ b/src/radius/radius_server.c
@ -298,8 +298,6 @@ struct radius_server_data {
 };


-extern int wpa_debug_level;
-
 #define RADIUS_DEBUG(args...) \
 wpa_printf(MSG_DEBUG, "RADIUS SRV: " args)
 #define RADIUS_ERROR(args...) \
--- a/src/utils/wpa_debug.h
+++ b/src/utils/wpa_debug.h
@ -11,6 +11,10 @@

 #include "wpabuf.h"

+extern int wpa_debug_level;
+extern int wpa_debug_show_keys;
+extern int wpa_debug_timestamp;
+
 /* Debugging function - conditional printf and hex dump. Driver wrappers can
 * use these for debugging purposes. */

--- a/tests/test-asn1.c
+++ b/tests/test-asn1.c
@ -11,8 +11,6 @@
 #include "common.h"
 #include "tls/asn1.h"

-extern int wpa_debug_level;
-

 static const char * asn1_class_str(int class)
 {
--- a/tests/test-https.c
+++ b/tests/test-https.c
@ -12,9 +12,6 @@
 #include "common.h"
 #include "crypto/tls.h"

-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-

 static void https_tls_event_cb(void *ctx, enum tls_event ev,
 			       union tls_event_data *data)
--- a/tests/test-milenage.c
+++ b/tests/test-milenage.c
@ -5,9 +5,6 @@
 #include "crypto/milenage.h"


-extern int wpa_debug_level;
-
-
 /**
 * milenage_opc - Determine OPc from OP and K
 * @op: OP = 128-bit operator variant algorithm configuration field
--- a/tests/test-x509.c
+++ b/tests/test-x509.c
@ -11,8 +11,6 @@
 #include "common.h"
 #include "tls/x509v3.h"

-extern int wpa_debug_level;
-

 int main(int argc, char *argv[])
 {
--- a/tests/test-x509v3.c
+++ b/tests/test-x509v3.c
@ -12,8 +12,6 @@
 #include "tls/asn1.h"
 #include "tls/x509v3.h"

-extern int wpa_debug_level;
-

 int main(int argc, char *argv[])
 {
--- a/wlantest/rx_data.c
+++ b/wlantest/rx_data.c
@ -14,8 +14,6 @@
 #include "common/ieee802_11_defs.h"
 #include "wlantest.h"

-extern int wpa_debug_level;
-

 static const char * data_stype(u16 stype)
 {
--- a/wlantest/rx_eapol.c
+++ b/wlantest/rx_eapol.c
@ -19,8 +19,6 @@
 #include "rsn_supp/wpa_ie.h"
 #include "wlantest.h"

-extern int wpa_debug_level;
-

 static int is_zero(const u8 *buf, size_t len)
 {
--- a/wlantest/test_vectors.c
+++ b/wlantest/test_vectors.c
@ -13,10 +13,6 @@
 #include "wlantest.h"


-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-
-
 static void test_vector_tkip(void)
 {
 	u8 tk[] = {
--- a/wlantest/wlantest.c
+++ b/wlantest/wlantest.c
@ -13,11 +13,6 @@
 #include "wlantest.h"


-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-extern int wpa_debug_timestamp;
-
-
 static void wlantest_terminate(int sig, void *signal_ctx)
 {
 	eloop_terminate();
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@ -1750,9 +1750,6 @@ static int wpa_supplicant_ctrl_iface_blacklist(struct wpa_supplicant *wpa_s,
 }


-extern int wpa_debug_level;
-extern int wpa_debug_timestamp;
-
 static const char * debug_level_str(int level)
 {
 	switch (level) {
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@ -28,10 +28,6 @@
 #include "dbus_dict_helpers.h"
 #include "dbus_common_i.h"

-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-extern int wpa_debug_timestamp;
-
 static const char *debug_strings[] = {
 	"excessive", "msgdump", "debug", "info", "warning", "error", NULL
 };
--- a/wpa_supplicant/dbus/dbus_old_handlers.c
+++ b/wpa_supplicant/dbus/dbus_old_handlers.c
@ -25,10 +25,6 @@
 #include "dbus_old_handlers.h"
 #include "dbus_dict_helpers.h"

-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-extern int wpa_debug_timestamp;
-
 /**
 * wpas_dbus_new_invalid_opts_error - Return a new invalid options error message
 * @message: Pointer to incoming dbus message this error refers to
--- a/wpa_supplicant/eapol_test.c
+++ b/wpa_supplicant/eapol_test.c
@ -30,9 +30,6 @@
 #include "wpas_glue.h"


-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-
 struct wpa_driver_ops *wpa_drivers[] = { NULL };


--- a/wpa_supplicant/preauth_test.c
+++ b/wpa_supplicant/preauth_test.c
@ -27,9 +27,6 @@
 #include "drivers/driver.h"


-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-
 struct wpa_driver_ops *wpa_drivers[] = { NULL };


--- a/wpa_supplicant/tests/test_wpa.c
+++ b/wpa_supplicant/tests/test_wpa.c
@ -17,10 +17,6 @@
 #include "ap/wpa_auth.h"


-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-
-
 struct wpa {
 	u8 auth_addr[ETH_ALEN];
 	u8 supp_addr[ETH_ALEN];
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@ -944,8 +944,6 @@ static void usage(void)
 }


-extern int wpa_debug_level;
-
 int main(int argc, char *argv[])
 {
 	int c, i;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@ -104,10 +104,6 @@ const char *wpa_supplicant_full_license5 =
 "\n";
 #endif /* CONFIG_NO_STDOUT_DEBUG */

-extern int wpa_debug_level;
-extern int wpa_debug_show_keys;
-extern int wpa_debug_timestamp;
-
 /* Configure default/group WEP keys for static WEP */
 int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
 {
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@ -2319,8 +2319,6 @@ int wpas_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
 #endif /* CONFIG_WPS_NFC */


-extern int wpa_debug_level;
-
 static void wpas_wps_dump_ap_info(struct wpa_supplicant *wpa_s)
 {
 	size_t i;