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>
Patrick Steinhardt committed
Dec 6, 2024 at 11:27 UTC
8108d1ac948c1029b29d8180dd5dbfdc5f2efb38
1 file changed
+8
-13
daemon.c
+8
-13
@@ -503,8 +503,7 @@ static struct daemon_service daemon_service[] = {
503
504
static void enable_service(const char *name, int ena)
505
{
506
- int i;
507
- for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
506
+ for (size_t i = 0; i < ARRAY_SIZE(daemon_service); i++) {
507
if (!strcmp(daemon_service[i].name, name)) {
508
daemon_service[i].enabled = ena;
509
return;
@@ -515,8 +514,7 @@ static void enable_service(const char *name, int ena)
514
515
static void make_service_overridable(const char *name, int ena)
516
{
518
- int i;
519
- for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
517
+ for (size_t i = 0; i < ARRAY_SIZE(daemon_service); i++) {
518
if (!strcmp(daemon_service[i].name, name)) {
519
daemon_service[i].overridable = ena;
520
return;
@@ -737,7 +735,7 @@ static void set_keep_alive(int sockfd)
735
static int execute(void)
736
{
737
char *line = packet_buffer;
740
- int pktlen, len, i;
738
+ int pktlen, len;
739
char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
740
struct hostinfo hi = HOSTINFO_INIT;
741
struct strvec env = STRVEC_INIT;
@@ -758,7 +756,7 @@ static int execute(void)
756
if (len != pktlen)
757
parse_extra_args(&hi, &env, line + len + 1, pktlen - len - 1);
758
761
- for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
759
+ for (size_t i = 0; i < ARRAY_SIZE(daemon_service); i++) {
760
struct daemon_service *s = &(daemon_service[i]);
761
const char *arg;
762
@@ -1108,8 +1106,8 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
1106
if (!listen_addr->nr)
1107
setup_named_sock(NULL, listen_port, socklist);
1108
else {
1111
- int i, socknum;
1112
- for (i = 0; i < listen_addr->nr; i++) {
1109
+ int socknum;
1110
+ for (size_t i = 0; i < listen_addr->nr; i++) {
1111
socknum = setup_named_sock(listen_addr->items[i].string,
1112
listen_port, socklist);
1113
@@ -1123,11 +1121,10 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
1121
static int service_loop(struct socketlist *socklist)
1122
{
1123
struct pollfd *pfd;
1126
- int i;
1124
1125
CALLOC_ARRAY(pfd, socklist->nr);
1126
1130
- for (i = 0; i < socklist->nr; i++) {
1127
+ for (size_t i = 0; i < socklist->nr; i++) {
1128
pfd[i].fd = socklist->list[i];
1129
pfd[i].events = POLLIN;
1130
}
@@ -1135,8 +1132,6 @@ static int service_loop(struct socketlist *socklist)
1132
signal(SIGCHLD, child_handler);
1133
1134
for (;;) {
1138
- int i;
1139
-
1135
check_dead_children();
1136
1137
if (poll(pfd, socklist->nr, -1) < 0) {
@@ -1148,7 +1143,7 @@ static int service_loop(struct socketlist *socklist)
1143
continue;
1144
}
1145
1151
- for (i = 0; i < socklist->nr; i++) {
1146
+ for (size_t i = 0; i < socklist->nr; i++) {
1147
if (pfd[i].revents & POLLIN) {
1148
union {
1149
struct sockaddr sa;