frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buffer a couple CARD32s on the stack instead of using an extra iovec. Also a bugfix: do not hold a reference to longlen after it goes out of scope.

This commit is contained in:
Jamey Sharp 2006-02-27 12:12:33 -08:00
parent 8f991bdd38
commit c05ae15b66
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xcb_out.c
View File

@ -84,6 +84,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
static const char pad[3]; static const char pad[3];
int ret; int ret;
int i; int i;
CARD32 prefix[2];
struct iovec *padded; struct iovec *padded;
int padlen = 0; int padlen = 0;
enum workarounds workaround = WORKAROUND_NONE; enum workarounds workaround = WORKAROUND_NONE;
@ -99,7 +100,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
#else #else
malloc malloc
#endif #endif
((req->count * 2 + 3) * sizeof(struct iovec)); ((req->count * 2 + 2) * sizeof(struct iovec));
if(!(flags & XCB_REQUEST_RAW)) if(!(flags & XCB_REQUEST_RAW))
{ {
@ -134,14 +135,13 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
((CARD16 *) vector[0].iov_base)[1] = shortlen; ((CARD16 *) vector[0].iov_base)[1] = shortlen;
if(!shortlen) if(!shortlen)
{ {
padded[0].iov_base = vector[0].iov_base; padded[0].iov_base = prefix;
padded[0].iov_len = sizeof(CARD32); padded[0].iov_len = sizeof(prefix);
prefix[0] = ((CARD32 *) vector[0].iov_base)[0];
prefix[1] = ++longlen;
vector[0].iov_base = ((char *) vector[0].iov_base) + sizeof(CARD32); vector[0].iov_base = ((char *) vector[0].iov_base) + sizeof(CARD32);
vector[0].iov_len -= sizeof(CARD32); vector[0].iov_len -= sizeof(CARD32);
++longlen; padlen = 1;
padded[1].iov_base = &longlen;
padded[1].iov_len = sizeof(CARD32);
padlen = 2;
} }
} }
flags &= ~XCB_REQUEST_RAW; flags &= ~XCB_REQUEST_RAW;