@@ -503,8 +503,7 @@ static struct daemon_service daemon_service[] = {
503503
504504static void enable_service (const char * name , int ena )
505505{
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 ++ ) {
508507 if (!strcmp (daemon_service [i ].name , name )) {
509508 daemon_service [i ].enabled = ena ;
510509 return ;
@@ -515,8 +514,7 @@ static void enable_service(const char *name, int ena)
515514
516515static void make_service_overridable (const char * name , int ena )
517516{
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 ++ ) {
520518 if (!strcmp (daemon_service [i ].name , name )) {
521519 daemon_service [i ].overridable = ena ;
522520 return ;
@@ -737,7 +735,7 @@ static void set_keep_alive(int sockfd)
737735static int execute (void )
738736{
739737 char * line = packet_buffer ;
740- int pktlen , len , i ;
738+ int pktlen , len ;
741739 char * addr = getenv ("REMOTE_ADDR" ), * port = getenv ("REMOTE_PORT" );
742740 struct hostinfo hi = HOSTINFO_INIT ;
743741 struct strvec env = STRVEC_INIT ;
@@ -758,7 +756,7 @@ static int execute(void)
758756 if (len != pktlen )
759757 parse_extra_args (& hi , & env , line + len + 1 , pktlen - len - 1 );
760758
761- for (i = 0 ; i < ARRAY_SIZE (daemon_service ); i ++ ) {
759+ for (size_t i = 0 ; i < ARRAY_SIZE (daemon_service ); i ++ ) {
762760 struct daemon_service * s = & (daemon_service [i ]);
763761 const char * arg ;
764762
@@ -1108,8 +1106,8 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
11081106 if (!listen_addr -> nr )
11091107 setup_named_sock (NULL , listen_port , socklist );
11101108 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 ++ ) {
11131111 socknum = setup_named_sock (listen_addr -> items [i ].string ,
11141112 listen_port , socklist );
11151113
@@ -1123,20 +1121,17 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
11231121static int service_loop (struct socketlist * socklist )
11241122{
11251123 struct pollfd * pfd ;
1126- int i ;
11271124
11281125 CALLOC_ARRAY (pfd , socklist -> nr );
11291126
1130- for (i = 0 ; i < socklist -> nr ; i ++ ) {
1127+ for (size_t i = 0 ; i < socklist -> nr ; i ++ ) {
11311128 pfd [i ].fd = socklist -> list [i ];
11321129 pfd [i ].events = POLLIN ;
11331130 }
11341131
11351132 signal (SIGCHLD , child_handler );
11361133
11371134 for (;;) {
1138- int i ;
1139-
11401135 check_dead_children ();
11411136
11421137 if (poll (pfd , socklist -> nr , -1 ) < 0 ) {
@@ -1148,7 +1143,7 @@ static int service_loop(struct socketlist *socklist)
11481143 continue ;
11491144 }
11501145
1151- for (i = 0 ; i < socklist -> nr ; i ++ ) {
1146+ for (size_t i = 0 ; i < socklist -> nr ; i ++ ) {
11521147 if (pfd [i ].revents & POLLIN ) {
11531148 union {
11541149 struct sockaddr sa ;
0 commit comments