Merge branch 'feature/remve_file_name_in_debuglog' into 'master'

wujiangang · wujiangang · commit d6038a2a1c76 · 2018-05-04T17:10:37.000+08:00
feat(tcpip_adapter): Remove file name from debug log

See merge request sdk/ESP8266_RTOS_SDK!133
diff --git a/components/tcpip_adapter/component.mk b/components/tcpip_adapter/component.mk
@@ -5,4 +5,4 @@ COMPONENT_ADD_INCLUDEDIRS += include
 
 COMPONENT_SRCDIRS := ./
 
-CFLAGS += -DLWIP_OPEN_SRC -DMEMLEAK_DEBUG -U__FILE__ -D__FILE__='"$(subst $(dir $<),,$<)"'
+CFLAGS += -DMEMLEAK_DEBUG
diff --git a/components/tcpip_adapter/include/tcpip_adapter.h b/components/tcpip_adapter/include/tcpip_adapter.h
@@ -52,8 +52,8 @@ bool default_hostname;
 #define IFNAME1 'n'
 
 #ifdef CONFIG_TCPIP_ADAPER_DEBUG
-#define TAG ""
-#define TCPIP_ATAPTER_LOG(str, ...) printf(TAG __FILE__ " line: %d " str, __LINE__, ##__VA_ARGS__)
+#define TAG "TCPIP_ADAPTER"
+#define TCPIP_ATAPTER_LOG(str, ...) printf(TAG " line: %d " str, __LINE__, ##__VA_ARGS__)
 #else
 #define TCPIP_ATAPTER_LOG(str, ...)
 #endif

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ COMPONENT_ADD_INCLUDEDIRS += include`
`5`	`5`
`6`	`6`	`COMPONENT_SRCDIRS := ./`
`7`	`7`
`8`		`-CFLAGS += -DLWIP_OPEN_SRC -DMEMLEAK_DEBUG -U__FILE__ -D__FILE__='"$(subst $(dir $<),,$<)"'`
	`8`	`+CFLAGS += -DMEMLEAK_DEBUG`