From 5310be8838f8db748a698bd3a98f8d00a4114e65 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Tue, 18 Oct 2016 15:16:17 +0530 Subject: events: Add FMT_WARN for gf_event Raghavendra G found that posix is trying to print %s but passing an int when HEALTH_CHECK fails in posix. These are the kind of bugs that should be caught at compilation itself. Also fixed the problematic gf_event() callers. BUG: 1386097 Change-Id: Id7bd6d9a9690237cec3ca1aefa2aac085e8a1270 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/15671 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Atin Mukherjee CentOS-regression: Gluster Build System --- libglusterfs/src/events.c | 2 +- libglusterfs/src/events.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'libglusterfs/src') diff --git a/libglusterfs/src/events.c b/libglusterfs/src/events.c index b7b513eb39a..6b3a73d8ae4 100644 --- a/libglusterfs/src/events.c +++ b/libglusterfs/src/events.c @@ -32,7 +32,7 @@ int -gf_event (eventtypes_t event, char *fmt, ...) +_gf_event (eventtypes_t event, char *fmt, ...) { int ret = 0; int sock = -1; diff --git a/libglusterfs/src/events.h b/libglusterfs/src/events.h index 6b280a0066f..e059bc9c4d1 100644 --- a/libglusterfs/src/events.h +++ b/libglusterfs/src/events.h @@ -15,13 +15,19 @@ #ifdef USE_EVENTS int -gf_event (eventtypes_t event, char *fmt, ...); +_gf_event (eventtypes_t event, char *fmt, ...); #else static inline int -gf_event (eventtypes_t event, char *fmt, ...) +_gf_event (eventtypes_t event, char *fmt, ...) { return 0; } #endif /* USE_EVENTS */ +#define gf_event(event, fmt...) \ + do { \ + FMT_WARN(fmt); \ + _gf_event (event, ##fmt); \ + } while (0) + #endif /* __EVENTS_H__ */ -- cgit