summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/xcb_in.c22
-rw-r--r--src/xcb_out.c3
2 files changed, 12 insertions, 13 deletions
diff --git a/src/xcb_in.c b/src/xcb_in.c
index ecacb99..3bf54f3 100644
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -443,18 +443,16 @@ void _xcb_in_destroy(_xcb_in *in)
int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround, int flags)
{
- if(workaround != WORKAROUND_NONE || flags != 0)
- {
- pending_reply *pend = malloc(sizeof(pending_reply));
- if(!pend)
- return 0;
- pend->request = request;
- pend->workaround = workaround;
- pend->flags = flags;
- pend->next = 0;
- *c->in.pending_replies_tail = pend;
- c->in.pending_replies_tail = &pend->next;
- }
+ pending_reply *pend = malloc(sizeof(pending_reply));
+ assert(workaround != WORKAROUND_NONE || flags != 0);
+ if(!pend)
+ return 0;
+ pend->request = request;
+ pend->workaround = workaround;
+ pend->flags = flags;
+ pend->next = 0;
+ *c->in.pending_replies_tail = pend;
+ c->in.pending_replies_tail = &pend->next;
return 1;
}
diff --git a/src/xcb_out.c b/src/xcb_out.c
index eb41e59..2667973 100644
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -165,7 +165,8 @@ unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, c
request = ++c->out.request;
assert(request != 0);
- _xcb_in_expect_reply(c, request, workaround, flags);
+ if(workaround != WORKAROUND_NONE || flags != 0)
+ _xcb_in_expect_reply(c, request, workaround, flags);
if(!req->isvoid)
c->in.request_expected = c->out.request;