devicemonitor: Avoid maybe-uninitialized compiler warning

On Arch Linux x86_64, gcc 7.2.0-3, -Og -g3:

gstdevicemonitor.c: In function ‘bus_sync_message’:
gstdevicemonitor.c:276:8: error: ‘matches’ may be used uninitialized in this function [-Werror=maybe-uninitialized]

This commit also simplifies the code a bit.

https://bugzilla.gnome.org/show_bug.cgi?id=789983
This commit is contained in:
Jan Alexander Steffens (heftig) 2017-11-06 20:23:12 +01:00 committed by Tim-Philipp Müller
parent 464f840a23
commit d9b20492f3

View file

@ -236,7 +236,7 @@ bus_sync_message (GstBus * bus, GstMessage * message,
GstMessageType type = GST_MESSAGE_TYPE (message); GstMessageType type = GST_MESSAGE_TYPE (message);
if (type == GST_MESSAGE_DEVICE_ADDED || type == GST_MESSAGE_DEVICE_REMOVED) { if (type == GST_MESSAGE_DEVICE_ADDED || type == GST_MESSAGE_DEVICE_REMOVED) {
gboolean matches; gboolean matches = TRUE;
GstDevice *device; GstDevice *device;
GstDeviceProvider *provider; GstDeviceProvider *provider;
@ -250,7 +250,7 @@ bus_sync_message (GstBus * bus, GstMessage * message,
GST_DEVICE_PROVIDER (gst_object_get_parent (GST_OBJECT (device))); GST_DEVICE_PROVIDER (gst_object_get_parent (GST_OBJECT (device)));
if (is_provider_hidden (monitor, monitor->priv->hidden, provider)) { if (is_provider_hidden (monitor, monitor->priv->hidden, provider)) {
matches = FALSE; matches = FALSE;
} else if (monitor->priv->filters->len) { } else {
guint i; guint i;
for (i = 0; i < monitor->priv->filters->len; i++) { for (i = 0; i < monitor->priv->filters->len; i++) {
@ -265,8 +265,6 @@ bus_sync_message (GstBus * bus, GstMessage * message,
if (matches) if (matches)
break; break;
} }
} else {
matches = TRUE;
} }
GST_OBJECT_UNLOCK (monitor); GST_OBJECT_UNLOCK (monitor);