Diff between fc180e2f74d6e05af95234c900d88f35a358cfd5 and 223ff5165fd7bedc8b547400aae10cb4e289e8eb

Changed Files

File Additions Deletions Status
obexd/src/log.c +2 -2 modified
obexd/src/log.h +2 -2 modified

Full Patch

diff --git a/obexd/src/log.c b/obexd/src/log.c
index fe045a4..ac8327c 100644
--- a/obexd/src/log.c
+++ b/obexd/src/log.c
@@ -57,7 +57,7 @@ void error(const char *format, ...)
 	va_end(ap);
 }
 
-void debug(const char *format, ...)
+void log_debug(const char *format, ...)
 {
 	va_list ap;
 
@@ -185,7 +185,7 @@ void obex_debug(int evt, int cmd, int rsp)
 		rspstr = obex_response[i].name;
 	}
 
-	debug("%s(0x%x), %s(0x%x), %s(0x%x)", evtstr, evt, cmdstr, cmd,
+	log_debug("%s(0x%x), %s(0x%x), %s(0x%x)", evtstr, evt, cmdstr, cmd,
 								rspstr, rsp);
 }
 
diff --git a/obexd/src/log.h b/obexd/src/log.h
index 897924d..12dc513 100644
--- a/obexd/src/log.h
+++ b/obexd/src/log.h
@@ -23,7 +23,7 @@
 
 void info(const char *format, ...) __attribute__((format(printf, 1, 2)));
 void error(const char *format, ...) __attribute__((format(printf, 1, 2)));
-void debug(const char *format, ...) __attribute__((format(printf, 1, 2)));
+void log_debug(const char *format, ...) __attribute__((format(printf, 1, 2)));
 void obex_debug(int evt, int cmd, int rsp);
 
 void log_init(const char *ident, const char *debug, int log_option);
@@ -52,5 +52,5 @@ struct log_debug_desc {
 		.file = __FILE__, .flags = LOG_DEBUG_FLAG_DEFAULT, \
 	}; \
 	if (__log_debug_desc.flags & LOG_DEBUG_FLAG_PRINT) \
-		debug("%s:%s() " fmt,  __FILE__, __FUNCTION__ , ## arg); \
+		log_debug("%s:%s() " fmt,  __FILE__, __FUNCTION__ , ## arg); \
 } while (0)