laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 )
Change subject: socket, select: Fix -Wsign-compare warnings ......................................................................
socket, select: Fix -Wsign-compare warnings
Change-Id: Idf6213e66e9bf609e930c6134292458a7d521871 --- M src/select.c M src/socket.c 2 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/26814/1
diff --git a/src/select.c b/src/select.c index ddff132..735ea3e 100644 --- a/src/select.c +++ b/src/select.c @@ -316,7 +316,7 @@ }
/* iterate over first n_fd entries of g_poll.poll + dispatch */ -static int poll_disp_fds(int n_fd) +static int poll_disp_fds(unsigned int n_fd) { struct osmo_fd *ufd; unsigned int i; diff --git a/src/socket.c b/src/socket.c index 1251061..b33116c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -114,7 +114,7 @@ static int addrinfo_helper_multi(struct addrinfo **addrinfo, uint16_t family, uint16_t type, uint8_t proto, const char **hosts, size_t host_cnt, uint16_t port, bool passive) { - int i, j; + unsigned int i, j;
for (i = 0; i < host_cnt; i++) { addrinfo[i] = addrinfo_helper(family, type, proto, hosts[i], port, passive); @@ -210,7 +210,8 @@ static int multiaddr_snprintf(char* buf, size_t buf_len, const char **hosts, size_t host_cnt) { int len = 0, offset = 0, rem = buf_len; - int ret, i; + unsigned int i; + int ret; char *after;
if (buf_len < 3) @@ -665,7 +666,7 @@ /* Build array of addresses taking first addrinfo result of the requested family * for each host in addrs_buf. */ static int addrinfo_to_sockaddr(uint16_t family, const struct addrinfo **result, - const char **hosts, int host_cont, + const char **hosts, unsigned int host_cont, uint8_t *addrs_buf, size_t addrs_buf_len) { size_t host_idx, offset = 0; const struct addrinfo *rp; @@ -721,7 +722,7 @@ { struct addrinfo *res_loc[OSMO_SOCK_MAX_ADDRS], *res_rem[OSMO_SOCK_MAX_ADDRS]; int sfd = -1, rc, on = 1; - int i; + unsigned int i; bool loc_has_v4addr, rem_has_v4addr; bool loc_has_v6addr, rem_has_v6addr; struct sockaddr_in6 addrs_buf[OSMO_SOCK_MAX_ADDRS];
tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 )
Change subject: socket, select: Fix -Wsign-compare warnings ......................................................................
Patch Set 1: Code-Review+1
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 )
Change subject: socket, select: Fix -Wsign-compare warnings ......................................................................
Patch Set 1:
(2 comments)
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/select.c File src/select.c:
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/select.c@319 PS1, Line 319: static int poll_disp_fds(unsigned int n_fd) it's a bit strange using an unsigned for an fd, it's usually an int right?
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/socket.c File src/socket.c:
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/socket.c@213 PS1, Line 213: unsigned int i; this one should actually be a size_t afaiu.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 )
Change subject: socket, select: Fix -Wsign-compare warnings ......................................................................
Patch Set 1:
(2 comments)
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/select.c File src/select.c:
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/select.c@319 PS1, Line 319: static int poll_disp_fds(unsigned int n_fd)
it's a bit strange using an unsigned for an fd, it's usually an int right?
n_fd == number of FDs. Cannot be negative.
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/socket.c File src/socket.c:
https://gerrit.osmocom.org/c/libosmocore/+/26814/1/src/socket.c@213 PS1, Line 213: unsigned int i;
this one should actually be a size_t afaiu.
Ack
Hello Jenkins Builder, tnt, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/26814
to look at the new patch set (#2).
Change subject: socket, select: Fix -Wsign-compare warnings ......................................................................
socket, select: Fix -Wsign-compare warnings
Change-Id: Idf6213e66e9bf609e930c6134292458a7d521871 --- M src/select.c M src/socket.c 2 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/26814/2
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 )
Change subject: socket, select: Fix -Wsign-compare warnings ......................................................................
Patch Set 2: Code-Review+2
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 )
Change subject: socket, select: Fix -Wsign-compare warnings ......................................................................
socket, select: Fix -Wsign-compare warnings
Change-Id: Idf6213e66e9bf609e930c6134292458a7d521871 --- M src/select.c M src/socket.c 2 files changed, 6 insertions(+), 5 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved
diff --git a/src/select.c b/src/select.c index ddff132..735ea3e 100644 --- a/src/select.c +++ b/src/select.c @@ -316,7 +316,7 @@ }
/* iterate over first n_fd entries of g_poll.poll + dispatch */ -static int poll_disp_fds(int n_fd) +static int poll_disp_fds(unsigned int n_fd) { struct osmo_fd *ufd; unsigned int i; diff --git a/src/socket.c b/src/socket.c index 1251061..449c825 100644 --- a/src/socket.c +++ b/src/socket.c @@ -114,7 +114,7 @@ static int addrinfo_helper_multi(struct addrinfo **addrinfo, uint16_t family, uint16_t type, uint8_t proto, const char **hosts, size_t host_cnt, uint16_t port, bool passive) { - int i, j; + unsigned int i, j;
for (i = 0; i < host_cnt; i++) { addrinfo[i] = addrinfo_helper(family, type, proto, hosts[i], port, passive); @@ -210,7 +210,8 @@ static int multiaddr_snprintf(char* buf, size_t buf_len, const char **hosts, size_t host_cnt) { int len = 0, offset = 0, rem = buf_len; - int ret, i; + size_t i; + int ret; char *after;
if (buf_len < 3) @@ -665,7 +666,7 @@ /* Build array of addresses taking first addrinfo result of the requested family * for each host in addrs_buf. */ static int addrinfo_to_sockaddr(uint16_t family, const struct addrinfo **result, - const char **hosts, int host_cont, + const char **hosts, unsigned int host_cont, uint8_t *addrs_buf, size_t addrs_buf_len) { size_t host_idx, offset = 0; const struct addrinfo *rp; @@ -721,7 +722,7 @@ { struct addrinfo *res_loc[OSMO_SOCK_MAX_ADDRS], *res_rem[OSMO_SOCK_MAX_ADDRS]; int sfd = -1, rc, on = 1; - int i; + unsigned int i; bool loc_has_v4addr, rem_has_v4addr; bool loc_has_v6addr, rem_has_v6addr; struct sockaddr_in6 addrs_buf[OSMO_SOCK_MAX_ADDRS];