[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

[Matthew Booth]

The following commit has been merged in the experimental branch:
commit f7c312ba6bc99a331f2b3996624dc3408a8cc3c0
Author: Matthew Booth <mbooth at redhat.com>
Date:   Thu May 16 16:21:42 2013 +0100

    Fix compiler warning when libselinux is not present
    
    static function selinux_warning() isn't used if HAVE_LIBSELINUX isn't
    defined, which results in a warning.

diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index 4588602..10a4d2c 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -138,7 +138,10 @@ static int make_drive_priv (guestfs_h *g, struct drive *drv, const char *selinux
 static void drive_free_priv (void *);
 static void set_socket_create_context (guestfs_h *g);
 static void clear_socket_create_context (guestfs_h *g);
+
+#if HAVE_LIBSELINUX
 static void selinux_warning (guestfs_h *g, const char *func, const char *selinux_op, const char *data);
+#endif
 
 static int
 launch_libvirt (guestfs_h *g, const char *libvirt_uri)
@@ -1716,6 +1719,7 @@ libvirt_error (guestfs_h *g, const char *fs, ...)
   free (msg);
 }
 
+#if HAVE_LIBSELINUX
 static void
 selinux_warning (guestfs_h *g, const char *func,
                  const char *selinux_op, const char *data)
@@ -1724,6 +1728,7 @@ selinux_warning (guestfs_h *g, const char *func,
          " [you can ignore this UNLESS using SELinux + sVirt]",
          func, selinux_op, data ? data : "(none)");
 }
+#endif
 
 /* This backend assumes virtio-scsi is available. */
 static int

-- 
Libguestfs Debian packaging