Hi,
this updates all log_printf definitions in totem.
I have pushed this patch already or trunk wouldn't even start.
Fabio
Index: include/corosync/totem/totem.h
===================================================================
--- include/corosync/totem/totem.h (revision 2179)
+++ include/corosync/totem/totem.h (working copy)
@@ -64,8 +64,9 @@
const char *file_name,
int file_line,
unsigned int level,
+ unsigned int tag,
const char *format,
- ...) __attribute__((format(printf, 6, 7)));
+ ...) __attribute__((format(printf, 7, 8)));
int log_level_security;
int log_level_error;
Index: exec/totemnet.c
===================================================================
--- exec/totemnet.c (revision 2179)
+++ exec/totemnet.c (working copy)
@@ -156,8 +156,9 @@
const char *function,
const char *file,
int line, unsigned int level,
+ unsigned int tag,
const char *format,
- ...)__attribute__((format(printf, 6, 7)));
+ ...)__attribute__((format(printf, 7, 8)));
hdb_handle_t handle;
@@ -242,7 +243,7 @@
do { \
instance->totemnet_log_printf (instance->totemnet_subsys_id, \
__FUNCTION__, __FILE__, __LINE__, \
- level, (const char *)format, ##args); \
+ level, 0, (const char *)format, ##args); \
} while (0);
Index: exec/totempg.c
===================================================================
--- exec/totempg.c (revision 2179)
+++ exec/totempg.c (working copy)
@@ -159,8 +159,8 @@
static int totempg_log_level_debug;
static int totempg_subsys_id;
static void (*totempg_log_printf) (int subsys_id, const char *function,
- const char *file, int line, unsigned int level,
- const char *format, ...) __attribute__((format(printf, 6, 7)));
+ const char *file, int line, unsigned int level, unsigned int tag,
+ const char *format, ...) __attribute__((format(printf, 7, 8)));
struct totem_config *totempg_totem_config;
@@ -239,7 +239,7 @@
#define log_printf(level, format, args...) \
do { \
totempg_log_printf (totempg_subsys_id, __FUNCTION__, \
- __FILE__, __LINE__, level, format, ##args); \
+ __FILE__, __LINE__, level, 0, format, ##args); \
} while (0);
static int msg_count_send_ok (int msg_count);
Index: exec/totemrrp.c
===================================================================
--- exec/totemrrp.c (revision 2179)
+++ exec/totemrrp.c (working copy)
@@ -208,8 +208,8 @@
int totemrrp_subsys_id;
void (*totemrrp_log_printf) (int subsys, const char *function,
- const char *file, int line, unsigned int level,
- const char *format, ...)__attribute__((format(printf, 6, 7)));
+ const char *file, int line, unsigned int level, unsigned int tag,
+ const char *format, ...)__attribute__((format(printf, 7, 8)));
hdb_handle_t handle;
@@ -473,7 +473,7 @@
do { \
rrp_instance->totemrrp_log_printf ( \
rrp_instance->totemrrp_subsys_id, \
- __FUNCTION__, __FILE__, __LINE__, level, \
+ __FUNCTION__, __FILE__, __LINE__, level, 0, \
format, ##args); \
} while (0);
Index: exec/totemsrp.c
===================================================================
--- exec/totemsrp.c (revision 2179)
+++ exec/totemsrp.c (working copy)
@@ -435,8 +435,8 @@
void (*totemsrp_log_printf) (int subsys,
const char *function, const char *file,
- int line, unsigned int level,
- const char *format, ...)__attribute__((format(printf, 6, 7)));;
+ int line, unsigned int level, unsigned int tag,
+ const char *format, ...)__attribute__((format(printf, 7, 8)));;
enum memb_state memb_state;
@@ -622,7 +622,7 @@
#define log_printf(level, format, args...) \
do { \
instance->totemsrp_log_printf (instance->totemsrp_subsys_id, \
- __FUNCTION__, __FILE__, __LINE__, level, \
+ __FUNCTION__, __FILE__, __LINE__, level, 0, \
format, ##args); \
} while (0);
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
