From afda4c81e7b2570d922345383e4533d86eb533f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 17 Feb 2022 02:40:44 +0100
Subject: [PATCH] pipewire: module-x11-bell: simplify `x11_connect()`

Since no cleanup needs to be in `x11_cleanup()`, the
`error` label may be removed and the error codes
can be returned directly.
---
 src/modules/module-x11-bell.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index b19b91953..7e279225e 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -156,13 +156,12 @@ static void display_io(void *data, int fd, uint32_t mask)
 
 static int x11_connect(struct impl *impl, const char *name)
 {
-	int res, major, minor;
+	int major, minor;
 	unsigned int auto_ctrls, auto_values;
 
 	if (!(impl->display = XOpenDisplay(name))) {
 		pw_log_error("XOpenDisplay() failed");
-		res = -EIO;
-		goto error;
+		return -EIO;
 	}
 
 	impl->source = pw_loop_add_io(impl->loop,
@@ -176,8 +175,7 @@ static int x11_connect(struct impl *impl, const char *name)
 
 	if (!XkbLibraryVersion(&major, &minor)) {
 		pw_log_error("XkbLibraryVersion() failed");
-		res = -EIO;
-		goto error;
+		return -EIO;
 	}
 
 	major = XkbMajorVersion;
@@ -185,9 +183,8 @@ static int x11_connect(struct impl *impl, const char *name)
 
 	if (!XkbQueryExtension(impl->display, NULL, &impl->xkb_event_base,
 				NULL, &major, &minor)) {
-		res = -EIO;
 		pw_log_error("XkbQueryExtension() failed");
-		goto error;
+		return -EIO;
 	}
 
 	XkbSelectEvents(impl->display, XkbUseCoreKbd, XkbBellNotifyMask, XkbBellNotifyMask);
@@ -195,9 +192,7 @@ static int x11_connect(struct impl *impl, const char *name)
 	XkbSetAutoResetControls(impl->display, XkbAudibleBellMask, &auto_ctrls, &auto_values);
 	XkbChangeEnabledControls(impl->display, XkbUseCoreKbd, XkbAudibleBellMask, 0);
 
-	res = 0;
-error:
-	return res;
+	return 0;
 }
 
 static void module_destroy(void *data)