mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove config.h inclusion in debug.h

Browse Source 
* update msusb to use DEBUG_MSUSB
* remove unused DEBUG_MSG
This commit is contained in:
Bernhard Miklautz 2014-04-15 18:36:22 +02:00
parent 5202e6384f
commit 0cb7874749
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/freerdp/utils/debug.h
View File

@ -20,10 +20,6 @@
#ifndef FREERDP_UTILS_DEBUG_H
#define FREERDP_UTILS_DEBUG_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#define DEBUG_NULL(fmt, ...) do { } while (0)
/* When building for android redirect all debug messages
@ -61,10 +57,4 @@
#define DEBUG_WARN(fmt, ...) DEBUG_PRINT("Warning %s (%s:%d): ", fmt, ## __VA_ARGS__)
#endif
#ifdef WITH_DEBUG
#define DEBUG_MSG(fmt, ...) DEBUG_PRINT("DBG %s (%s:%d): ", fmt, ## __VA_ARGS__)
#else
#define DEBUG_MSG(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif
#endif /* FREERDP_UTILS_DEBUG_H */

9
libfreerdp/utils/msusb.c
View File

@ -25,6 +25,13 @@
#include <freerdp/utils/debug.h>
#include <freerdp/utils/msusb.h>
#ifdef WITH_DEBUG_MSUSB
#define DEBUG_MSUSB(fmt, ...) DEBUG_CLASS(MSUSB, fmt, ## __VA_ARGS__)
#else
#define DEBUG_MSUSB(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif
static MSUSB_PIPE_DESCRIPTOR* msusb_mspipe_new()
{
MSUSB_PIPE_DESCRIPTOR* MsPipe = (MSUSB_PIPE_DESCRIPTOR*) malloc(sizeof(MSUSB_PIPE_DESCRIPTOR));
@ -285,7 +292,7 @@ MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, UINT32 data_size, UINT3
if (lenConfiguration != 0x9 || typeConfiguration != 0x2)
{
DEBUG_MSG("%s: len and type must be 0x9 and 0x2 , but it is 0x%x and 0x%x",
DEBUG_MSUSB("%s: len and type must be 0x9 and 0x2 , but it is 0x%x and 0x%x",
lenConfiguration, typeConfiguration);
}