mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon: fix loops that have mismatching integer types

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt
2024-12-06 11:27:25 +01:00
committed by Junio C Hamano
parent 80c9e70ebe
commit 8108d1ac94
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
daemon.c
View File

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