[Debian-ha-commits] [pacemaker] 59/69: Fix: cib: don't have code that is shortcircuited in plugin-mode compiled makes coverity happy

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch debian/master
in repository pacemaker.

commit 0ecd7ac63e64830f95c25967e473a59883b46f5d
Author: Klaus Wenninger <klaus.wenninger at aon.at>
Date:   Thu Jan 14 17:13:01 2016 +0100

    Fix: cib: don't have code that is shortcircuited in plugin-mode compiled
      makes coverity happy
---
 cib/callbacks.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cib/callbacks.c b/cib/callbacks.c
index 8c32955..69bace9 100644
--- a/cib/callbacks.c
+++ b/cib/callbacks.c
@@ -74,6 +74,7 @@ int cib_process_command(xmlNode * request, xmlNode ** reply,
 gboolean cib_common_callback(qb_ipcs_connection_t * c, void *data, size_t size,
                              gboolean privileged);
 
+#if !SUPPORT_PLUGIN
 static gboolean cib_read_legacy_mode(void)
 {
     static gboolean init = TRUE;
@@ -89,17 +90,18 @@ static gboolean cib_read_legacy_mode(void)
 
     return legacy;
 }
+#endif
 
 gboolean cib_legacy_mode(void)
 {
 #if SUPPORT_PLUGIN
     return TRUE;
-#endif
-
+#else
     if(cib_read_legacy_mode()) {
         return TRUE;
     }
     return legacy_mode;
+#endif
 }
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git