From 1755a9d3da61860aa8bbe0137d572a51981e1d68 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Mon, 1 Aug 2016 11:56:27 +0530 Subject: [PATCH 35/86] events: move conditional macro check USE_EVENTS inside gf_events > Reviewed-on: http://review.gluster.org/15054 > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > NetBSD-regression: NetBSD Build System > Reviewed-by: Kotresh HR > Reviewed-by: Aravinda VK Change-Id: I88279b11b648e676a4544bbb55c7466fbc55ffa7 BUG: 1351589 Signed-off-by: Atin Mukherjee Reviewed-on: https://code.engineering.redhat.com/gerrit/84741 Tested-by: Aravinda Vishwanathapura Krishna Murthy Reviewed-by: Milind Changire --- cli/src/cli-cmd-peer.c | 4 ---- cli/src/cli-cmd-volume.c | 8 -------- libglusterfs/src/events.c | 4 +++- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/cli/src/cli-cmd-peer.c b/cli/src/cli-cmd-peer.c index 36c328a..fc72075 100644 --- a/cli/src/cli-cmd-peer.c +++ b/cli/src/cli-cmd-peer.c @@ -90,11 +90,9 @@ out: CLI_STACK_DESTROY (frame); -#if (USE_EVENTS) if (ret == 0) { gf_event (EVENT_PEER_ATTACH, "host=%s", (char *)words[2]); } -#endif return ret; } @@ -166,11 +164,9 @@ out: CLI_STACK_DESTROY (frame); -#if (USE_EVENTS) if (ret == 0) { gf_event (EVENT_PEER_DETACH, "host=%s", (char *)words[2]); } -#endif return ret; } diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 7e53514..740a867 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -243,11 +243,9 @@ out: } CLI_STACK_DESTROY (frame); -#if (USE_EVENTS) if (ret == 0) { gf_event (EVENT_VOLUME_CREATE, "name=%s", (char *)words[2]); } -#endif return ret; } @@ -322,11 +320,9 @@ out: CLI_STACK_DESTROY (frame); -#if (USE_EVENTS) if (ret == 0) { gf_event (EVENT_VOLUME_DELETE, "name=%s", (char *)words[2]); } -#endif return ret; } @@ -402,11 +398,9 @@ out: CLI_STACK_DESTROY (frame); -#if (USE_EVENTS) if (ret == 0) { gf_event (EVENT_VOLUME_START, "name=%s", (char *)words[2]); } -#endif return ret; } @@ -540,11 +534,9 @@ out: CLI_STACK_DESTROY (frame); -#if (USE_EVENTS) if (ret == 0) { gf_event (EVENT_VOLUME_STOP, "name=%s", (char *)words[2]); } -#endif return ret; } diff --git a/libglusterfs/src/events.c b/libglusterfs/src/events.c index 9d78187..2df8c29 100644 --- a/libglusterfs/src/events.c +++ b/libglusterfs/src/events.c @@ -23,12 +23,13 @@ int gf_event (int event, char *fmt, ...) { + int ret = 0; +#if (USE_EVENTS) int sock = -1; char eventstr[EVENTS_MSG_MAX] = ""; struct sockaddr_un server; va_list arguments; char *msg = NULL; - int ret = 0; size_t eventstr_size = 0; if (event < 0 || event >= EVENT_LAST) { @@ -79,5 +80,6 @@ gf_event (int event, char *fmt, ...) out: sys_close(sock); GF_FREE(msg); +#endif return ret; } -- 1.7.1