From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 5 Aug 2009 10:04:26 +0000 (+0200)
Subject: Avoid a warning if compiling without inotify
X-Git-Tag: v0.7.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acec6c3d026cd30d399a32a2114ffa3254d09bcd;p=thirdparty%2Flibvirt.git

Avoid a warning if compiling without inotify

* src/xm_internal.c: split the implementations of xenInotifyActive()
---

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 03cee9d6ed..c869120acf 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -122,18 +122,18 @@ struct xenUnifiedDriver xenXMDriver = {
         virReportErrorHelper(conn, VIR_FROM_XENXM, code, __FILE__,         \
                                __FUNCTION__, __LINE__, fmt)
 
-static int xenInotifyActive(virConnectPtr conn)
-{
-    int ret;
 #ifndef WITH_XEN_INOTIFY
-    ret = 0;
+static int xenInotifyActive(virConnectPtr conn ATTRIBUTE_UNUSED)
+{
+   return 0;
+}
 #else
-    xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
-    ret = (priv->inotifyWatch > 0);
-#endif
-
-    return ret;
+static int xenInotifyActive(virConnectPtr conn)
+{
+   xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
+   return priv->inotifyWatch > 0;
 }
+#endif
 
 /* Convenience method to grab a int from the config file object */
 static int xenXMConfigGetBool(virConnectPtr conn,