diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-11-12 13:57:11 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-13 07:46:32 +0000 |
| commit | 18b8f48bc113267f2c548e4ce9a3e5b744ca9c1e (patch) | |
| tree | 0b7cd16deaa706fe43c5ce3fa3dcac5610642294 | |
| parent | 91290f7b6cf14dc3e40fc74712c212ae5eb75b7c (diff) | |
Fix compilation when _DEBUG is defined.
CMake's Visual C++ generator creates projects that compile with the
Debug configuration by default, which defines _DEBUG. Fix DEBUG_DUMP's
declaration so that we compile in that case.
While we're here note that the "airpd" prefix isn't limited to AirPcap,
so we might want to change it accordingly.
Change-Id: I5476f28c63020f0f66ee9128731bc4b3dc720765
Reviewed-on: https://code.wireshark.org/review/11787
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/crypt/airpdcap.c | 9 | ||||
| -rw-r--r-- | epan/crypt/airpdcap_debug.h | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index 42c67ddf3c..142061ff17 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -32,8 +32,15 @@ * SUCH DAMAGE. */ +/* + * The files matching airpcap*.[ch] were originally developed as part of + * Wireshark's support for AirPcap adapters. However, they've been used + * for general 802.11 decryption for quite some time. It might make sense + * to rename them accordingly. + */ + /****************************************************************************/ -/* File includes */ +/* File includes */ #include "config.h" diff --git a/epan/crypt/airpdcap_debug.h b/epan/crypt/airpdcap_debug.h index fbfe28ec02..7e52befcd2 100644 --- a/epan/crypt/airpdcap_debug.h +++ b/epan/crypt/airpdcap_debug.h @@ -89,9 +89,9 @@ void print_debug_line(const CHAR *function, const CHAR *msg, const INT level); #endif #endif -static inline void DEBUG_DUMP(const char* x, guint8* y, int z) +static inline void DEBUG_DUMP(const char* x, const guint8* y, int z) { - char* tmp_str = bytes_to_str(NULL, (const guint8 *) y, (z)); + char* tmp_str = bytes_to_str(NULL, y, (z)); g_warning("%s: %s", x, tmp_str); wmem_free(NULL, tmp_str); } |