dprint: Adapt log functions for g++ compiler

Author: oanatitoc

dprint.c

@@ -40,7 +40,7 @@
 
 /* used internally by the log interface */
 typedef void (*log_print_pre_fmt_f)(log_print_f gen_print_func, int log_level,
-	int facility, char *module, const char *func,
+	int facility, const char *module, const char *func,
 	char *stderr_plain_fmt, char *syslog_plain_fmt, char *format, va_list ap);
 
 struct log_consumer_t {
@@ -72,16 +72,16 @@ int log_msg_buf_size = 4096;
 
 str log_cee_hostname;
 
-static void stderr_dprint(int log_level, int facility, char *module, const char *func,
+static void stderr_dprint(int log_level, int facility, const char *module, const char *func,
 	char *format, va_list ap);
-static void syslog_dprint(int log_level, int facility, char *module, const char *func,
+static void syslog_dprint(int log_level, int facility, const char *module, const char *func,
 	char *format, va_list ap);
 
 static void stderr_pre_fmt_func(log_print_f gen_print_func, int log_level,
-	int facility, char *module, const char *func,
+	int facility, const char *module, const char *func,
 	char *stderr_plain_fmt, char *syslog_plain_fmt, char *format, va_list ap);
 static void syslog_pre_fmt_func(log_print_f gen_print_func, int log_level,
-	int facility, char *module, const char *func,
+	int facility, const char *module, const char *func,
 	char *stderr_plain_fmt, char *syslog_plain_fmt, char *format, va_list ap);
 
 /* static consumer table to be used until a shm one is alloc'ed;
@@ -311,7 +311,7 @@ enum log_json_format {
 };
 
 static int log_print_json(str *buf, enum log_json_format json_fmt, char *time,
-	int pid, char *prefix, char *level, char *module, const char *func,
+	int pid, char *prefix, const char *level, const char *module, const char *func,
 	char *format, va_list ap)
 {
 	char *p, *tmp;
@@ -454,7 +454,7 @@ static int log_print_json(str *buf, enum log_json_format json_fmt, char *time,
 	return len;
 }
 
-static void stderr_dprint(int log_level, int facility, char *module, const char *func,
+static void stderr_dprint(int log_level, int facility, const char *module, const char *func,
 	char *format, va_list ap)
 {
 	char *time;
@@ -486,7 +486,7 @@ static void stderr_dprint(int log_level, int facility, char *module, const char
 	}
 }
 
-static void syslog_dprint(int log_level, int facility, char *module, const char *func,
+static void syslog_dprint(int log_level, int facility, const char *module, const char *func,
 	char *format, va_list ap)
 {
 	int level;
@@ -553,7 +553,7 @@ static str evi_func_str = str_init("function");
 static str evi_prefix_str = str_init("prefix");
 static str evi_msg_str = str_init("message");
 
-static void event_dprint(int level, int facility, char *module, const char *func,
+static void event_dprint(int level, int facility, const char *module, const char *func,
 	char *format, va_list ap)
 {
 	evi_params_p list = NULL;
@@ -652,7 +652,7 @@ static void event_dprint(int level, int facility, char *module, const char *func
 
 /* generic consumer that registers to the log interface */
 static void gen_consumer_pre_fmt_func(log_print_f gen_print_func, int log_level,
-	int facility, char *module, const char *func,
+	int facility, const char *module, const char *func,
 	char *stderr_plain_fmt, char *syslog_plain_fmt, char *format, va_list ap)
 {
 	/* skip the time, pid, prefix and function arguments from va_list */
@@ -666,7 +666,7 @@ static void gen_consumer_pre_fmt_func(log_print_f gen_print_func, int log_level,
 }
 
 static void stderr_pre_fmt_func(log_print_f gen_print_func, int log_level,
-	int facility, char *module, const char *func,
+	int facility, const char *module, const char *func,
 	char *stderr_plain_fmt, char *syslog_plain_fmt, char *format, va_list ap)
 {
 	char *fmt = stderr_log_format == LOG_FORMAT_PLAIN ? stderr_plain_fmt : format;
@@ -675,15 +675,15 @@ static void stderr_pre_fmt_func(log_print_f gen_print_func, int log_level,
 }
 
 static void syslog_pre_fmt_func(log_print_f gen_print_func, int log_level,
-	int facility, char *module, const char *func,
+	int facility, const char *module, const char *func,
 	char *stderr_plain_fmt, char *syslog_plain_fmt, char *format, va_list ap)
 {
 	char *fmt = syslog_log_format == LOG_FORMAT_PLAIN ? syslog_plain_fmt : format;
 
 	gen_print_func(log_level, facility, module, func, fmt, ap);
 }
 
-void dprint(int log_level, int facility, char *module, const char *func,
+void dprint(int log_level, int facility, const char *module, const char *func,
 	char *stderr_fmt, char *syslog_fmt, char *format, ...)
 {
 	va_list ap, ap_copy;

dprint.h

@@ -68,7 +68,7 @@
 #ifdef __SUNPRO_C
 	#define DP_PREFIX
 #else
-	#define DP_PREFIX  "%s [%d] "
+	#define DP_PREFIX  (char *)"%s [%d] "
 #endif
 
 #define DP_ALERT_STR    "ALERT"
@@ -170,7 +170,7 @@ int dp_my_pid(void);
 
 void stderr_dprint_tmp(char *format, ...);
 
-void dprint(int log_level, int facility, char *module, const char *func,
+void dprint(int log_level, int facility, const char *module, const char *func,
 	char *stderr_fmt, char *syslog_fmt, char *format, ...)
 	__attribute__ ((__format__ (__printf__, 5, 8)));
 
@@ -206,9 +206,9 @@ static inline char* dp_time(void)
 	return ctime_buf+4;  /* remove name of day*/
 }
 
-static inline char *dp_log_level_str(int log_level)
+static inline const char *dp_log_level_str(int log_level)
 {
-	char *level_str;
+	const char *level_str;
 
 	switch (log_level) {
 	case L_ALERT:
@@ -454,8 +454,8 @@ static inline char *dp_log_level_str(int log_level)
 				dprint(_log_level, _log_facility, \
 					LOG_PREFIX_UTIL(MOD_NAME), __DP_FUNC, \
 					_stderr_prefix LOG_PREFIX _fmt, \
-					"%s" _syslog_prefix LOG_PREFIX _fmt, \
-					_fmt, \
+					(char *)"%s" _syslog_prefix LOG_PREFIX _fmt, \
+					(char *)_fmt, \
 					dp_time(), dp_my_pid(), log_prefix, __DP_FUNC, ## args) \
 
 		#define LM_GEN(_lev, fmt, args...) \

log_interface.h

@@ -25,7 +25,7 @@
 #include <stdarg.h>
 
 /* printing function to be registered by a generic logging consumer */
-typedef void (*log_print_f)(int log_level, int facility, char *module, const char *func,
+typedef void (*log_print_f)(int log_level, int facility, const char *module, const char *func,
 	char *format, va_list ap);
 
 int register_log_consumer(char *name, log_print_f print_func,