diff --git a/components/net/lwip-2.1/porting/include/arch/cc.h b/components/net/lwip-2.1/porting/include/arch/cc.h index 1ff65d08..6fdb8649 100644 --- a/components/net/lwip-2.1/porting/include/arch/cc.h +++ b/components/net/lwip-2.1/porting/include/arch/cc.h @@ -93,23 +93,15 @@ #define LWIP_RAND rand -extern void HilogPrintf(const char *fmt, ...); - -#ifndef HILOG_INFO -#define HILOG_INFO(...) -#ifndef HILOG_MODULE_APP -#define HILOG_MODULE_APP 0 -#endif +#ifndef LWIP_LOGGER +#define LWIP_LOGGER(msg) #endif -#ifndef HILOG_ERROR -#define HILOG_ERROR(...) -#endif - -#define LWIP_PLATFORM_DIAG(vars) HilogPrintf vars -#define LWIP_PLATFORM_ASSERT(x) do {HILOG_ERROR(HILOG_MODULE_APP, \ - "Assertion \"%s\" errno %d line %d in %s\n", \ - x, errno, __LINE__, __FILE__);} while (0) +extern void LwipLogPrintf(const char *fmt, ...); +#define LWIP_PLATFORM_DIAG(vars) LwipLogPrintf vars +#define LWIP_PLATFORM_ASSERT(x) do { \ + LWIP_PLATFORM_DIAG(("Assertion \"%s\" failed at line %d in %s\n", x, __LINE__, __FILE__)); \ + } while (0) #define init_waitqueue_head(...) #define poll_check_waiters(...) diff --git a/components/net/lwip-2.1/porting/src/sys_arch.c b/components/net/lwip-2.1/porting/src/sys_arch.c index 832e4309..64b625f6 100644 --- a/components/net/lwip-2.1/porting/src/sys_arch.c +++ b/components/net/lwip-2.1/porting/src/sys_arch.c @@ -324,7 +324,7 @@ void sys_mutex_set_invalid(sys_mutex_t *mutex) *mutex = LOSCFG_BASE_IPC_MUX_LIMIT; } -void HilogPrintf(const char *fmt, ...) +void LwipLogPrintf(const char *fmt, ...) { if ((fmt == NULL) || (strlen(fmt) == 0)) { return; @@ -337,8 +337,8 @@ void HilogPrintf(const char *fmt, ...) len = vsprintf_s(buf, sizeof(buf) - 1, fmt, ap); va_end(ap); if (len < 0) { - HILOG_INFO(HILOG_MODULE_APP, "log param invalid or buf is not enough."); + LWIP_LOGGER("log param invalid or buf is not enough."); return; } - HILOG_INFO(HILOG_MODULE_APP, buf); + LWIP_LOGGER(buf); }