Added headers for converting logging in libfreerdp, channels, clients and servers.

include/freerdp/channels/log.h

@@ -21,38 +21,23 @@
 #define FREERDP_CHANNELS_LOG_H
 
 #include <winpr/wlog.h>
+#include <freerdp/log.h>
 
-#define CLOG_PRINT(level, file, fkt, line, dbg_str, fmt, ...) \
+#define CHANNELS_TAG(tag) FREERDP_TAG("channels.") tag
-	do { \
-		char tag[1024] = { 0 }; \
-		wLogMessage msg; \
-		wLog *log; \
-		\
-		strncat(tag, "com.freerdp.channels.", sizeof(tag) - 1); \
-		strncat(tag, dbg_str, sizeof(tag) - 1 - sizeof("com.freerdp.channels.")); \
-		log = WLog_Get(tag); \
-		\
-		msg.Type = WLOG_MESSAGE_TEXT; \
-		msg.Level = level; \
-		msg.FormatString = fmt; \
-		msg.LineNumber = line; \
-		msg.FileName = file; \
-		msg.FunctionName = fkt; \
-		WLog_PrintMessage(log, &msg, ##__VA_ARGS__); \
-	} while (0 )
 
+/* NOTE: Do not use these defines, they will be removed soon! */
 #define CLOG_NULL(fmt, ...) do { } while (0)
-#define CLOG_CLASS(_dbg_class, fmt, ...) CLOG_PRINT(WLOG_ERROR, __FILE__, \
+#define CLOG_CLASS(_dbg_class, fmt, ...) WLog_LVL(CHANNELS_TAG("legacy." #_dbg_class), \
-	__FUNCTION__, 	__LINE__, #_dbg_class, fmt, ## __VA_ARGS__)
+		WLOG_ERROR, fmt, ## __VA_ARGS__)
-#define CLOG_DBG(fmt, ...) CLOG_PRINT(WLOG_DEBUG, __FILE__, __FUNCTION__, \
+#define CLOG_DBG(fmt, ...) WLog_LVL(CHANNELS_TAG("legacy"), \
-	__LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
+									WLOG_DEBUG, fmt, ## __VA_ARGS__)
-#define CLOG_INFO(fmt, ...) CLOG_PRINT(WLOG_INFO, __FILE__, __FUNCTION__, \
+#define CLOG_INFO(fmt, ...) WLog_LVL(CHANNELS_TAG("legacy"), \
-	__LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
+									 WLOG_INFO, fmt, ## __VA_ARGS__)
-#define CLOG_WARN(fmt, ...) CLOG_PRINT(WLOG_WARN, __FILE__, __FUNCTION__, \
+#define CLOG_WARN(fmt, ...) WLog_LVL(CHANNELS_TAG("legacy"), \
-	__LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
+									 WLOG_WARN, fmt, ## __VA_ARGS__)
-#define CLOG_ERR(fmt, ...) CLOG_PRINT(WLOG_ERROR, __FILE__, __FUNCTION__, \
+#define CLOG_ERR(fmt, ...) WLog_LVL(CHANNELS_TAG("legacy"), \
-	__LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
+									WLOG_ERROR, fmt, ## __VA_ARGS__)
-#define CLOG_FATAL(fmt, ...) CLOG_PRINT(WLOG_FATAL, __FILE__, __FUNCTION__, \
+#define CLOG_FATAL(fmt, ...) WLog_LVL(CHANNELS_TAG("legacy"), \
-	__LINE__, __FUNCTION__, fmt, ## __VA_ARGS__)
+									  WLOG_FATAL, fmt, ## __VA_ARGS__)
 
 #endif /* FREERDP_UTILS_DEBUG_H */

include/freerdp/log.h

@@ -0,0 +1,29 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * FreeRDP log defines
+ *
+ * Copyright 2014 Armin Novak <armin.novak@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FREERDP_LOG_H
+#define FREERDP_LOG_H
+
+#include <winpr/wlog.h>
+
+#define FREERDP_TAG(tag) "com.freerdp." tag
+#define SERVER_TAG(tag) FREERDP_TAG("server.") tag
+#define CLIENT_TAG(tag) FREERDP_TAG("client.") tag
+
+#endif /* FREERDP_UTILS_DEBUG_H */

include/freerdp/utils/debug.h

@@ -24,7 +24,7 @@
 
 #define DEBUG_PRINT(level, file, fkt, line, dbg_str, fmt, ...) \
 	do { \
-		wLog *log = WLog_Get("com.freerdp." dbg_str); \
+		wLog *log = WLog_Get("com.freerdp.legacy"); \
 		wLogMessage msg; \
 		\
 		msg.Type = WLOG_MESSAGE_TEXT; \
@@ -38,10 +38,10 @@
 
 #define DEBUG_NULL(fmt, ...) do { } while (0)
 #define DEBUG_CLASS(_dbg_class, fmt, ...) DEBUG_PRINT(WLOG_ERROR, __FILE__, \
-	__FUNCTION__, 	__LINE__, #_dbg_class, fmt, ## __VA_ARGS__)
+		__FUNCTION__, 	__LINE__, #_dbg_class, fmt, ## __VA_ARGS__)
 #define DEBUG_MSG(fmt, ...) DEBUG_PRINT(WLOG_DEBUG, __FILE__, __FUNCTION__, \
-	__LINE__, "freerdp", fmt, ## __VA_ARGS__)
+										__LINE__, "freerdp", fmt, ## __VA_ARGS__)
 #define DEBUG_WARN(fmt, ...) DEBUG_PRINT(WLOG_ERROR, __FILE__, __FUNCTION__, \
-	__LINE__, "freerdp", fmt, ## __VA_ARGS__)
+		__LINE__, "freerdp", fmt, ## __VA_ARGS__)
 
 #endif /* FREERDP_UTILS_DEBUG_H */