Skip to content
This repository has been archived by the owner on Apr 18, 2023. It is now read-only.

Commit

Permalink
Eliminate once-used check_error utility function
Browse files Browse the repository at this point in the history
  • Loading branch information
stapelberg committed Sep 14, 2016
1 parent d48c9b1 commit 5594139
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 23 deletions.
8 changes: 0 additions & 8 deletions include/util.h
Expand Up @@ -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().
*
Expand Down
6 changes: 5 additions & 1 deletion src/main.c
Expand Up @@ -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) {
Expand Down
14 changes: 0 additions & 14 deletions src/util.c
Expand Up @@ -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().
*
Expand Down

0 comments on commit 5594139

Please sign in to comment.