projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move _xcb_read_block to xcb_in.c and make it static. Change calls in xcb_conn.c to...
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
d7a17ba
..
698cf51
100644
(file)
--- a/
src/xcb_conn.c
+++ b/
src/xcb_conn.c
@@
-38,8
+38,9
@@
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
{
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
{
+ static const char pad[3];
XCBConnSetupReq out;
XCBConnSetupReq out;
- struct iovec parts[
3
];
+ struct iovec parts[
6
];
int count = 0;
int endian = 0x01020304;
int ret;
int count = 0;
int endian = 0x01020304;
int ret;
@@
-57,14
+58,21
@@
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
out.authorization_protocol_data_len = 0;
parts[count].iov_len = sizeof(XCBConnSetupReq);
parts[count++].iov_base = &out;
out.authorization_protocol_data_len = 0;
parts[count].iov_len = sizeof(XCBConnSetupReq);
parts[count++].iov_base = &out;
+ parts[count].iov_len = XCB_PAD(sizeof(XCBConnSetupReq));
+ parts[count++].iov_base = (caddr_t) pad;
if(auth_info)
{
parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
parts[count++].iov_base = auth_info->name;
if(auth_info)
{
parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
parts[count++].iov_base = auth_info->name;
+ parts[count].iov_len = XCB_PAD(out.authorization_protocol_name_len);
+ parts[count++].iov_base = (caddr_t) pad;
parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
parts[count++].iov_base = auth_info->data;
parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
parts[count++].iov_base = auth_info->data;
+ parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len);
+ parts[count++].iov_base = (caddr_t) pad;
}
}
+ assert(count <= sizeof(parts) / sizeof(*parts));
pthread_mutex_lock(&c->iolock);
_xcb_out_write_block(c, parts, count);
pthread_mutex_lock(&c->iolock);
_xcb_out_write_block(c, parts, count);
@@
-80,7
+88,7
@@
static int read_setup(XCBConnection *c)
if(!c->setup)
return 0;
if(!c->setup)
return 0;
- if(_xcb_
read_block(c->fd
, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
+ if(_xcb_
in_read_block(c
, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
return 0;
{
return 0;
{
@@
-90,7
+98,7
@@
static int read_setup(XCBConnection *c)
c->setup = tmp;
}
c->setup = tmp;
}
- if(_xcb_
read_block(c->fd
, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
+ if(_xcb_
in_read_block(c
, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
return 0;
/* 0 = failed, 2 = authenticate, 1 = success */
return 0;
/* 0 = failed, 2 = authenticate, 1 = success */
@@
-181,8
+189,6
@@
int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
int ret;
fd_set rfds, wfds;
int ret;
fd_set rfds, wfds;
- _xcb_assert_valid_sequence(c);
-
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
/* If the thing I should be doing is already being done, wait for it. */
if(should_write ? c->out.writing : c->in.reading)
{
@@
-208,10
+214,10
@@
int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
if(ret)
{
if(FD_ISSET(c->fd, &rfds))
if(ret)
{
if(FD_ISSET(c->fd, &rfds))
- ret = ret && _xcb_in_read(c)
> 0
;
+ ret = ret && _xcb_in_read(c);
if(FD_ISSET(c->fd, &wfds))
if(FD_ISSET(c->fd, &wfds))
- ret = ret && _xcb_out_write(c)
> 0
;
+ ret = ret && _xcb_out_write(c);
}
if(should_write)
}
if(should_write)