From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 3 Feb 2022 07:13:35 +0000 (+0400)
Subject: dbus: fix warning: label 'oom' defined but not used
X-Git-Tag: dbus-1.15.0~54^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06e7411f7e2dc463ab7b75011ef2a3beed8ad590;p=thirdparty%2Fdbus.git

dbus: fix warning: label 'oom' defined but not used

When DBUS_ENABLE_VERBOSE_MODE is not set, the compiler warns.

Let's remove the label.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index e936f648f..5b1feb909 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1431,10 +1431,7 @@ _dbus_poll_select (DBusPollFD *fds,
 #ifdef DBUS_ENABLE_VERBOSE_MODE
   _dbus_verbose("_dbus_poll: to=%d\n", timeout_milliseconds);
   if (!_dbus_dump_fd_events (fds, n_fds))
-    {
-      ready = -1;
-      goto oom;
-    }
+    return -1;
 #endif
 
   for (i = 0; i < n_fds; i++)
@@ -1474,8 +1471,7 @@ _dbus_poll_select (DBusPollFD *fds,
         if (!_dbus_dump_fdset (fds, n_fds, &read_set, &write_set, &err_set))
           {
             _dbus_win_set_errno (ENOMEM);
-            ready = -1;
-            goto oom;
+            return -1;
           }
 #endif
         for (i = 0; i < n_fds; i++)
@@ -1494,7 +1490,6 @@ _dbus_poll_select (DBusPollFD *fds,
               fdp->revents |= _DBUS_POLLERR;
           }
       }
-oom:
   return ready;
 }
 #endif