X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fverbose.h;h=71d5fe1e040092f49eee0c7ef2b5ab454c855bf3;hb=2243a0dd1adc75530bed663db808971789729df3;hp=5c9f88641a68b66d0c3945042037654019160680;hpb=8112056eecede587bf884f56629858c8b21bdbec;p=src%2Fapp-framework-binder.git

diff --git a/src/verbose.h b/src/verbose.h
index 5c9f8864..71d5fe1e 100644
--- a/src/verbose.h
+++ b/src/verbose.h
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 "IoT.bzh"
+ Copyright (C) 2016, 2017 "IoT.bzh"
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -18,45 +18,19 @@
 
 #pragma once
 
-#if !defined(VERBOSE_WITH_SYSLOG)
+#include <stdarg.h>
 
-  extern int verbosity;
-  extern void verbose(int level, const char *file, int line, const char *fmt, ...);
+extern int verbosity;
 
-# define ERROR(...)   do{if(verbosity>=0)verbose(3,__FILE__,__LINE__,__VA_ARGS__);}while(0)
-# define WARNING(...) do{if(verbosity>=1)verbose(4,__FILE__,__LINE__,__VA_ARGS__);}while(0)
-# define NOTICE(...)  do{if(verbosity>=1)verbose(5,__FILE__,__LINE__,__VA_ARGS__);}while(0)
-# define INFO(...)    do{if(verbosity>=2)verbose(6,__FILE__,__LINE__,__VA_ARGS__);}while(0)
-# define DEBUG(...)   do{if(verbosity>=3)verbose(7,__FILE__,__LINE__,__VA_ARGS__);}while(0)
-# define LOGUSER(app) NOTICE("Starting user application %s",app)
-# define LOGAUTH(app) NOTICE("Starting auth application %s",app)
+extern void verbose_set_name(const char *name, int authority);
+extern void verbose(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
+extern void vverbose(int level, const char *file, int line, const char *function, const char *fmt, va_list args);
 
-#else /* VERBOSE_WITH_SYSLOG is defined */
-
-# include <syslog.h>
-
-# define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER)
-# define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH)
-
-# if !defined(NDEBUG)
-
-    extern int verbosity;
-#   define ERROR(...)   syslog(LOG_ERR,__VA_ARGS__)
-#   define WARNING(...) do{if(verbosity)syslog(LOG_WARNING,__VA_ARGS__);}while(0)
-#   define NOTICE(...)  do{if(verbosity)syslog(LOG_NOTICE,__VA_ARGS__);}while(0)
-#   define INFO(...)    do{if(verbosity>1)syslog(LOG_INFO,__VA_ARGS__);}while(0)
-#   define DEBUG(...)   do{if(verbosity>2)syslog(LOG_DEBUG,__VA_ARGS__);}while(0)
-
-# else
-
-    extern void verbose_error(const char *file, int line);
-#   define ERROR(...)   verbose_error(__FILE__,__LINE__)
-#   define WARNING(...) do{/*nothing*/}while(0)
-#   define NOTICE(...)  do{/*nothing*/}while(0)
-#   define INFO(...)    do{/*nothing*/}while(0)
-#   define DEBUG(...)   do{/*nothing*/}while(0)
-
-# endif
-
-#endif
+# define ERROR(...)   do{if(verbosity>=0)verbose(3,__FILE__,__LINE__,__func__,__VA_ARGS__);}while(0)
+# define WARNING(...) do{if(verbosity>=1)verbose(4,__FILE__,__LINE__,__func__,__VA_ARGS__);}while(0)
+# define NOTICE(...)  do{if(verbosity>=1)verbose(5,__FILE__,__LINE__,__func__,__VA_ARGS__);}while(0)
+# define INFO(...)    do{if(verbosity>=2)verbose(6,__FILE__,__LINE__,__func__,__VA_ARGS__);}while(0)
+# define DEBUG(...)   do{if(verbosity>=3)verbose(7,__FILE__,__LINE__,__func__,__VA_ARGS__);}while(0)
+# define LOGUSER(app) verbose_set_name(app,0)
+# define LOGAUTH(app) verbose_set_name(app,1)