X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fverbose.h;h=6bedc323e1a62ea00a7aa2ef286ec7d6e943a22a;hb=8ed4166fe1e1d24c174ae53101159853709b1346;hp=25bd85b0ddae7a118969abf06bb122ae8b486d21;hpb=68a8eaafe5f43480f29308bfd2ec12ad54da43f1;p=src%2Fapp-framework-binder.git

diff --git a/src/verbose.h b/src/verbose.h
index 25bd85b0..6bedc323 100644
--- a/src/verbose.h
+++ b/src/verbose.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2016 IoT.bzh
+ Copyright (C) 2016, 2017 "IoT.bzh"
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -18,24 +18,43 @@
 
 #pragma once
 
-#if !defined(NDEBUG)
-#include <syslog.h>
+#include <stdarg.h>
+
+/*
+  verbosity tune the count of reported messages
+
+   verbosity value : reported messages
+   ----------------+------------------------
+    lesser than 0  : no message at all
+         0         : ERROR
+         1         : ERROR, WARNING, NOTICE
+         2         : ERROR, WARNING, NOTICE, INFO
+    greater than 2 : ERROR, WARNING, NOTICE, INFO, DEBUG
+
+*/
 extern int verbosity;
-#define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER)
-#define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH)
-#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
-#include <syslog.h>
-#define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER)
-#define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH)
-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
+
+extern void verbose_set_name(const char *name, int authority);
+
+/*
+ Level is defined by syslog standard:
+       KERN_EMERG             0        System is unusable
+       KERN_ALERT             1        Action must be taken immediately
+       KERN_CRIT              2        Critical conditions
+       KERN_ERR               3        Error conditions
+       KERN_WARNING           4        Warning conditions
+       KERN_NOTICE            5        Normal but significant condition
+       KERN_INFO              6        Informational
+       KERN_DEBUG             7        Debug-level messages
+*/
+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);
+
+# 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)
+