mirror of
https://github.com/cuberite/libevent.git
synced 2025-09-10 04:50:37 -04:00
Fix signed/unsigned warnings on opensolaris, where iov_len is signed
This commit is contained in:
parent
e5c214a423
commit
6be589ae68
6
buffer.c
6
buffer.c
@ -571,7 +571,7 @@ evbuffer_reserve_space(struct evbuffer *buf, ev_ssize_t size,
|
|||||||
|
|
||||||
vec[0].iov_base = CHAIN_SPACE_PTR(chain);
|
vec[0].iov_base = CHAIN_SPACE_PTR(chain);
|
||||||
vec[0].iov_len = CHAIN_SPACE_LEN(chain);
|
vec[0].iov_len = CHAIN_SPACE_LEN(chain);
|
||||||
EVUTIL_ASSERT(size<0 || vec[0].iov_len >= (size_t)size);
|
EVUTIL_ASSERT(size<0 || (size_t)vec[0].iov_len >= (size_t)size);
|
||||||
n = 1;
|
n = 1;
|
||||||
} else {
|
} else {
|
||||||
if (_evbuffer_expand_fast(buf, size, n_vecs)<0)
|
if (_evbuffer_expand_fast(buf, size, n_vecs)<0)
|
||||||
@ -622,7 +622,7 @@ evbuffer_commit_space(struct evbuffer *buf,
|
|||||||
(buf->last && vec[0].iov_base == (void*)CHAIN_SPACE_PTR(buf->last))) {
|
(buf->last && vec[0].iov_base == (void*)CHAIN_SPACE_PTR(buf->last))) {
|
||||||
/* The user only got or used one chain; it might not
|
/* The user only got or used one chain; it might not
|
||||||
* be the first one with space in it. */
|
* be the first one with space in it. */
|
||||||
if (vec[0].iov_len > CHAIN_SPACE_LEN(buf->last))
|
if ((size_t)vec[0].iov_len > (size_t)CHAIN_SPACE_LEN(buf->last))
|
||||||
goto done;
|
goto done;
|
||||||
buf->last->off += vec[0].iov_len;
|
buf->last->off += vec[0].iov_len;
|
||||||
added = vec[0].iov_len;
|
added = vec[0].iov_len;
|
||||||
@ -646,7 +646,7 @@ evbuffer_commit_space(struct evbuffer *buf,
|
|||||||
if (!chain)
|
if (!chain)
|
||||||
goto done;
|
goto done;
|
||||||
if (vec[i].iov_base != (void*)CHAIN_SPACE_PTR(chain) ||
|
if (vec[i].iov_base != (void*)CHAIN_SPACE_PTR(chain) ||
|
||||||
vec[i].iov_len > CHAIN_SPACE_LEN(chain))
|
(size_t)vec[i].iov_len > CHAIN_SPACE_LEN(chain))
|
||||||
goto done;
|
goto done;
|
||||||
chain = chain->next;
|
chain = chain->next;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user