fix mingw compilation warning

* src/libvirt.c (winsock_init) [HAVE_WINSOCK2_H]: Always return a value.

diff --git a/ChangeLog b/ChangeLog
index 0505ee4ee7fe144ae13410b781b5adf5eace09b3..4e9a905de969609a4da87104145da70ebca09c33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 10:54:23 CEST Jim Meyering <meyering@redhat.com>
+
+       fix mingw compilation warning
+       * src/libvirt.c (winsock_init) [HAVE_WINSOCK2_H]: Always return a value.
+
 Thu Oct 23 15:20:00 CEST 2008 Chris Lalancete <clalance@redhat.com>
        * src/storage_conf.c: brown paper bag bug.  I didn't preserve the
        <sources> tags properly, and I didn't put the <source> tag into the

diff --git a/src/libvirt.c b/src/libvirt.c
index 8fd594b0f73162dc6362d37221b247937e591f14..00c0cb20f2733a861e25515a3136df8cfb9cfb3d 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -238,8 +238,7 @@ winsock_init (void)
     /* http://msdn2.microsoft.com/en-us/library/ms742213.aspx */
     winsock_version = MAKEWORD (2, 2);
     err = WSAStartup (winsock_version, &winsock_data);
-    if (err != 0)
-        return -1;
+    return err == 0 ? 0 : -1;
 }
 #endif