From f9652adfd1315c0a817917eb35f61f43f58e673b Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Tue, 7 Aug 2012 11:40:16 +0530 Subject: glusterd: Fix compile time warning for gsyncd helper routine Change-Id: I262cc654a3d85ed690446b3875959565600b4bcd BUG: 846197 Signed-off-by: Venky Shankar Reviewed-on: http://review.gluster.org/3784 Tested-by: Gluster Build System Reviewed-by: Csaba Henk --- xlators/mgmt/glusterd/src/glusterd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index e1e0f09a..fdcc38d8 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -392,7 +392,6 @@ glusterd_crt_georep_folders (char *georepdir, glusterd_conf_t *conf) gf_log("", GF_LOG_DEBUG, "Returning %d", ret); return ret; } -#endif static void runinit_gsyncd_setrx (runner_t *runner, glusterd_conf_t *conf) @@ -416,7 +415,6 @@ configure_syncdaemon (glusterd_conf_t *conf) } while (0) { int ret = 0; -#if SYNCDAEMON_COMPILE runner_t runner = {0,}; char georepdir[PATH_MAX] = {0,}; int valid_state = 0; @@ -547,12 +545,17 @@ configure_syncdaemon (glusterd_conf_t *conf) RUN_GSYNCD_CMD; out: -#else - (void)conf; -#endif return ret ? -1 : 0; } #undef RUN_GSYNCD_CMD +#else /* SYNCDAEMON_COMPILE */ +static int +configure_syncdaemon (glusterd_conf_t *conf) +{ + return 0; +} +#endif /* !SYNCDAEMON_COMPILE */ + static int check_prepare_mountbroker_root (char *mountbroker_root) -- cgit