Fix last_with_data compilation on windows

This commit is contained in:
Nick Mathewson 2010-03-11 14:23:02 -05:00
parent e470ad3c35
commit 1e7b986827
2 changed files with 6 additions and 3 deletions

View File

@ -1770,7 +1770,7 @@ evbuffer_read(struct evbuffer *buf, evutil_socket_t fd, int howmuch)
nvecs = _evbuffer_read_setup_vecs(buf, howmuch, ev_vecs, 2, nvecs = _evbuffer_read_setup_vecs(buf, howmuch, ev_vecs, 2,
&chain, 1); &chain, 1);
for (i=0; i < n_vecs; ++i) for (i=0; i < nvecs; ++i)
WSABUF_FROM_EVBUFFER_IOV(&vecs[i], &ev_vecs[i]); WSABUF_FROM_EVBUFFER_IOV(&vecs[i], &ev_vecs[i]);
#endif #endif

View File

@ -249,12 +249,15 @@ evbuffer_launch_read(struct evbuffer *buf, size_t at_most,
buf_o->n_buffers = 0; buf_o->n_buffers = 0;
memset(buf_o->buffers, 0, sizeof(buf_o->buffers)); memset(buf_o->buffers, 0, sizeof(buf_o->buffers));
if (_evbuffer_expand_fast(buf, at_most) == -1) if (_evbuffer_expand_fast(buf, at_most, 2) == -1)
goto done; goto done;
evbuffer_freeze(buf, 0); evbuffer_freeze(buf, 0);
/* XXX This and evbuffer_read_setup_vecs() should say MAX_WSABUFS,
* not "2". But commit_read() above can't handle more than two
* buffers yet. */
nvecs = _evbuffer_read_setup_vecs(buf, at_most, nvecs = _evbuffer_read_setup_vecs(buf, at_most,
vecs, &chain, 1); vecs, 2, &chain, 1);
for (i=0;i<nvecs;++i) { for (i=0;i<nvecs;++i) {
WSABUF_FROM_EVBUFFER_IOV( WSABUF_FROM_EVBUFFER_IOV(
&buf_o->buffers[i], &buf_o->buffers[i],