From 8e797e6f4b95d759d5a2d6c072401c9eb5fcf68e Mon Sep 17 00:00:00 2001
From: Atin Mukherjee <amukherj@redhat.com>
Date: Mon, 1 Aug 2016 11:56:27 +0530
Subject: events: move conditional macro check USE_EVENTS inside gf_events

Change-Id: I88279b11b648e676a4544bbb55c7466fbc55ffa7
BUG: 1361983
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/15054
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
---
 cli/src/cli-cmd-peer.c   | 4 ----
 cli/src/cli-cmd-volume.c | 8 --------
 2 files changed, 12 deletions(-)

(limited to 'cli')

diff --git a/cli/src/cli-cmd-peer.c b/cli/src/cli-cmd-peer.c
index 36c328a7c12..fc720756dc8 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 af815da51ef..77635b76530 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;
 }
-- 
cgit