nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate once-used check_error utility function

This commit is contained in:
Michael Stapelberg 2016-09-14 09:19:25 +02:00
parent d48c9b1e33
commit 5594139676
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/util.h
View File

@ -98,14 +98,6 @@ bool update_if_necessary(uint32_t *destination, const uint32_t new_value);
*/ */
void exec_i3_utility(char *name, char *argv[]); 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(). * Checks if the given path exists by calling stat().
* *

6
src/main.c
View File

@ -538,7 +538,11 @@ int main(int argc, char *argv[]) {
xcb_void_cookie_t cookie; xcb_void_cookie_t cookie;
cookie = xcb_change_window_attributes_checked(conn, root, XCB_CW_EVENT_MASK, (uint32_t[]){ROOT_EVENT_MASK}); 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); xcb_get_geometry_reply_t *greply = xcb_get_geometry_reply(conn, gcookie, NULL);
if (greply == NULL) { if (greply == NULL) {

14
src/util.c
View File

@ -145,20 +145,6 @@ void exec_i3_utility(char *name, char *argv[]) {
_exit(2); _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(). * Checks if the given path exists by calling stat().
* *