From 6ef21745e819e038318facd9df47c5db0d65ea2a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 4 Oct 2021 11:10:04 +0200 Subject: [PATCH] gsm0710muxd-hack: LOGMUX macros: refactor Have only one LOGMUX macro, which will write to the log file if -o is set. --- src/gsm0710muxd-hack/src/gsm0710muxd.h | 32 +++++++++----------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/gsm0710muxd-hack/src/gsm0710muxd.h b/src/gsm0710muxd-hack/src/gsm0710muxd.h index d6f1cb4..83b6080 100644 --- a/src/gsm0710muxd-hack/src/gsm0710muxd.h +++ b/src/gsm0710muxd-hack/src/gsm0710muxd.h @@ -99,17 +99,20 @@ /******************************************************************************/ +#define LOGMUX(lvl, f, ...) do { \ + if (lvl <= syslog_level) { \ + if (logtofile) { \ + fprintf(muxlogfile, "%d:%s(): " f "\n", __LINE__, __func__, ##__VA_ARGS__); \ + fflush(muxlogfile); \ + } else { \ + fprintf(stderr, "%d:%s(): " f "\n", __LINE__, __func__, ##__VA_ARGS__); \ + } \ + } \ + } while (0) + #ifndef MUX_ANDROID #include //#define LOG(lvl, f, ...) do{if(lvl<=syslog_level)syslog(lvl,"%s:%d:%s(): " f "\n", __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__);}while(0) -#define LOGMUX(lvl,f,...) do{if(lvl<=syslog_level){\ - if (logtofile){\ - fprintf(muxlogfile,"%d:%s(): " f "\n", __LINE__, __FUNCTION__, ##__VA_ARGS__);\ - fflush(muxlogfile);}\ - else\ - fprintf(stderr,"%d:%s(): " f "\n", __LINE__, __FUNCTION__, ##__VA_ARGS__);\ - }\ - }while(0) #else //will enable logging using android logging framework (not to file) #ifdef MTK_RIL_MD1 @@ -127,19 +130,6 @@ #define LOG_NOTICE 5 #define LOG_INFO 6 #define LOG_DEBUG 7 - -#ifdef MTK_RIL_MD1 -#define LOGMUX(lvl,f,...) do{if(lvl<=syslog_level){\ - fprintf(stderr, \ - "[gsm0710muxd] %d:%s(): " f "\n", __LINE__, __FUNCTION__, ##__VA_ARGS__);}\ - }while(0) -#else -#define LOGMUX(lvl,f,...) do{if(lvl<=syslog_level){\ - fprintf(stderr, \ - "[gsm0710muxdmd2] %d:%s(): " f "\n", __LINE__, __FUNCTION__, ##__VA_ARGS__);}\ - }while(0) -#endif - #endif /*MUX_ANDROID*/ /******************************************************************************/