daemon: fix loops that have mismatching integer types

We have several loops in "daemon.c" that use a signed integer to loop
through a `size_t`. Adapt them to instead use a `size_t` as counter
value.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/daemon.c b/daemon.c
index 68789ceb222eeb389d58998fd00388f289868fc3..bf313bc21a0b82a12064c534af78c9ad51be78e6 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -503,8 +503,7 @@ static struct daemon_service daemon_service[] = {
 
 static void enable_service(const char *name, int ena)
 {
-       int i;
-       for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
+       for (size_t i = 0; i < ARRAY_SIZE(daemon_service); i++) {
                if (!strcmp(daemon_service[i].name, name)) {
                        daemon_service[i].enabled = ena;
                        return;
@@ -515,8 +514,7 @@ static void enable_service(const char *name, int ena)
 
 static void make_service_overridable(const char *name, int ena)
 {
-       int i;
-       for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
+       for (size_t i = 0; i < ARRAY_SIZE(daemon_service); i++) {
                if (!strcmp(daemon_service[i].name, name)) {
                        daemon_service[i].overridable = ena;
                        return;
@@ -737,7 +735,7 @@ static void set_keep_alive(int sockfd)
 static int execute(void)
 {
        char *line = packet_buffer;
-       int pktlen, len, i;
+       int pktlen, len;
        char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
        struct hostinfo hi = HOSTINFO_INIT;
        struct strvec env = STRVEC_INIT;
@@ -758,7 +756,7 @@ static int execute(void)
        if (len != pktlen)
                parse_extra_args(&hi, &env, line + len + 1, pktlen - len - 1);
 
-       for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
+       for (size_t i = 0; i < ARRAY_SIZE(daemon_service); i++) {
                struct daemon_service *s = &(daemon_service[i]);
                const char *arg;
 
@@ -1108,8 +1106,8 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
        if (!listen_addr->nr)
                setup_named_sock(NULL, listen_port, socklist);
        else {
-               int i, socknum;
-               for (i = 0; i < listen_addr->nr; i++) {
+               int socknum;
+               for (size_t i = 0; i < listen_addr->nr; i++) {
                        socknum = setup_named_sock(listen_addr->items[i].string,
                                                   listen_port, socklist);
 
@@ -1123,11 +1121,10 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
 static int service_loop(struct socketlist *socklist)
 {
        struct pollfd *pfd;
-       int i;
 
        CALLOC_ARRAY(pfd, socklist->nr);
 
-       for (i = 0; i < socklist->nr; i++) {
+       for (size_t i = 0; i < socklist->nr; i++) {
                pfd[i].fd = socklist->list[i];
                pfd[i].events = POLLIN;
        }
@@ -1135,8 +1132,6 @@ static int service_loop(struct socketlist *socklist)
        signal(SIGCHLD, child_handler);
 
        for (;;) {
-               int i;
-
                check_dead_children();
 
                if (poll(pfd, socklist->nr, -1) < 0) {
@@ -1148,7 +1143,7 @@ static int service_loop(struct socketlist *socklist)
                        continue;
                }
 
-               for (i = 0; i < socklist->nr; i++) {
+               for (size_t i = 0; i < socklist->nr; i++) {
                        if (pfd[i].revents & POLLIN) {
                                union {
                                        struct sockaddr sa;