X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=b252ffc85da2317db9cacc979b2364bd0ad451cf;hb=34168ab549fdf7c6c8a6fbe39824116698d01b12;hp=41764dfedbf894c304e145882b2ece1a54dabb09;hpb=57b0cd8fea498a32ff2322583c7278d5e86aa4e8;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_in.c b/src/xcb_in.c index 41764df..b252ffc 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -395,33 +395,18 @@ xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c) return ret; } -xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c, int *error) +xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c) { + xcb_generic_event_t *ret = 0; if(!c->has_error) { - xcb_generic_event_t *ret = 0; - int success; _xcb_lock_io(c); /* FIXME: follow X meets Z architecture changes. */ - success = _xcb_in_read(c); - if(success) + if(_xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */ ret = get_event(c); _xcb_unlock_io(c); - if(success) - { - if(error) - *error = 0; - return ret; - } - } - if(error) - *error = -1; - else - { - fprintf(stderr, "xcb_poll_for_event: I/O error occured, but no handler provided.\n"); - abort(); } - return 0; + return ret; } xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t cookie)