From 5594139676125716defd7b44f5ea10efd3781203 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 14 Sep 2016 09:19:25 +0200
Subject: [PATCH] Eliminate once-used check_error utility function

---
 include/util.h |  8 --------
 src/main.c     |  6 +++++-
 src/util.c     | 14 --------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/include/util.h b/include/util.h
index 28655178..9915c1a8 100644
--- a/include/util.h
+++ b/include/util.h
@@ -98,14 +98,6 @@ bool update_if_necessary(uint32_t *destination, const uint32_t new_value);
  */
 void exec_i3_utility(char *name, char *argv[]);
 
-/**
- * Checks a generic cookie for errors and quits with the given message if
- * there was an error.
- *
- */
-void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie,
-                 char *err_message);
-
 /**
  * Checks if the given path exists by calling stat().
  *
diff --git a/src/main.c b/src/main.c
index 8bbd23ba..367ebac1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -538,7 +538,11 @@ int main(int argc, char *argv[]) {
 
     xcb_void_cookie_t cookie;
     cookie = xcb_change_window_attributes_checked(conn, root, XCB_CW_EVENT_MASK, (uint32_t[]){ROOT_EVENT_MASK});
-    check_error(conn, cookie, "Another window manager seems to be running");
+    xcb_generic_error_t *error = xcb_request_check(conn, cookie);
+    if (error != NULL) {
+        ELOG("Another window manager seems to be running (X error %d)\n", error->error_code);
+        return 1;
+    }
 
     xcb_get_geometry_reply_t *greply = xcb_get_geometry_reply(conn, gcookie, NULL);
     if (greply == NULL) {
diff --git a/src/util.c b/src/util.c
index 53f78d72..d19f8c5e 100644
--- a/src/util.c
+++ b/src/util.c
@@ -145,20 +145,6 @@ void exec_i3_utility(char *name, char *argv[]) {
     _exit(2);
 }
 
-/*
- * Checks a generic cookie for errors and quits with the given message if there
- * was an error.
- *
- */
-void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_message) {
-    xcb_generic_error_t *error = xcb_request_check(conn, cookie);
-    if (error != NULL) {
-        fprintf(stderr, "ERROR: %s (X error %d)\n", err_message, error->error_code);
-        xcb_disconnect(conn);
-        exit(-1);
-    }
-}
-
 /*
  * Checks if the given path exists by calling stat().
  *
-- 
2.39.5