Eliminate once-used check_error utility function

[i3/i3] / src / util.c

diff --git a/src/util.c b/src/util.c
index 7a73011d050d879dc5aecd205e777f0779f16e95..d19f8c5ee07b0c216e1c4f980a47e4cdc80e667d 100644 (file)
--- 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().
  *
@@ -332,6 +318,23 @@ void *memmem(const void *l, size_t l_len, const void *s, size_t s_len) {
 
 #endif
 
+/*
+ * Escapes the given string if a pango font is currently used.
+ * If the string has to be escaped, the input string will be free'd.
+ *
+ */
+char *pango_escape_markup(char *input) {
+    if (!font_is_pango())
+        return input;
+
+#if PANGO_SUPPORT
+    char *escaped = g_markup_escape_text(input, -1);
+    FREE(input);
+
+    return escaped;
+#endif
+}
+
 /*
  * Handler which will be called when we get a SIGCHLD for the nagbar, meaning
  * it exited (or could not be started, depending on the exit code).