1*4882a593SmuzhiyunFrom 874da836bc857e5942675c59e19f4fd8ad09b13e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 29 Aug 2019 14:08:19 -0700 4*4882a593SmuzhiyunSubject: [PATCH 1/4] log: Avoid shadowing functions from std lib 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 7*4882a593Smuzhiyun--- 8*4882a593Smuzhiyun lib/log/log.c | 2 +- 9*4882a593Smuzhiyun lib/log/log.h | 8 ++++---- 10*4882a593Smuzhiyun 2 files changed, 5 insertions(+), 5 deletions(-) 11*4882a593Smuzhiyun 12*4882a593Smuzhiyundiff --git a/lib/log/log.c b/lib/log/log.c 13*4882a593Smuzhiyunindex 7d8e17c..18b67a5 100644 14*4882a593Smuzhiyun--- a/lib/log/log.c 15*4882a593Smuzhiyun+++ b/lib/log/log.c 16*4882a593Smuzhiyun@@ -82,7 +82,7 @@ enum log_level log_get_level(void) { 17*4882a593Smuzhiyun } 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun /* */ 20*4882a593Smuzhiyun-void __log(enum log_level level, const char *message) { 21*4882a593Smuzhiyun+void _ssiap_log(enum log_level level, const char *message) { 22*4882a593Smuzhiyun struct tm tm; 23*4882a593Smuzhiyun struct timeval tv; 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/lib/log/log.h b/lib/log/log.h 26*4882a593Smuzhiyunindex d94e482..66a707b 100644 27*4882a593Smuzhiyun--- a/lib/log/log.h 28*4882a593Smuzhiyun+++ b/lib/log/log.h 29*4882a593Smuzhiyun@@ -53,13 +53,13 @@ enum log_level { 30*4882a593Smuzhiyun }; 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun /* */ 33*4882a593Smuzhiyun-#define log(__level, __message) \ 34*4882a593Smuzhiyun+#define ssiap_log(__level, __message) \ 35*4882a593Smuzhiyun do { if (log_get_level() >= (enum log_level)(__level)) \ 36*4882a593Smuzhiyun- __log(__level, __message); \ 37*4882a593Smuzhiyun+ _ssiap_log(__level, __message); \ 38*4882a593Smuzhiyun } while (0) 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun #define dlog(__message) \ 41*4882a593Smuzhiyun- log(LOG_DEBUG, __message); 42*4882a593Smuzhiyun+ ssiap_log(LOG_DEBUG, __message); 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun /* */ 45*4882a593Smuzhiyun void log_init(enum log_level level, const char *path); 46*4882a593Smuzhiyun@@ -68,7 +68,7 @@ void log_init(enum log_level level, const char *path); 47*4882a593Smuzhiyun void log_fini(void); 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun /* */ 50*4882a593Smuzhiyun-void __log(enum log_level level, const char *message); 51*4882a593Smuzhiyun+void _ssiap_log(enum log_level level, const char *message); 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun /* */ 54*4882a593Smuzhiyun enum log_level log_get_level(void); 55*4882a593Smuzhiyun-- 56*4882a593Smuzhiyun2.23.0 57*4882a593Smuzhiyun 58