@@ -503,8 +503,7 @@ static struct daemon_service daemon_service[] = {
503
503
504
504
static void enable_service (const char * name , int ena )
505
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 ++ ) {
508
507
if (!strcmp (daemon_service [i ].name , name )) {
509
508
daemon_service [i ].enabled = ena ;
510
509
return ;
@@ -515,8 +514,7 @@ static void enable_service(const char *name, int ena)
515
514
516
515
static void make_service_overridable (const char * name , int ena )
517
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 ++ ) {
520
518
if (!strcmp (daemon_service [i ].name , name )) {
521
519
daemon_service [i ].overridable = ena ;
522
520
return ;
@@ -737,7 +735,7 @@ static void set_keep_alive(int sockfd)
737
735
static int execute (void )
738
736
{
739
737
char * line = packet_buffer ;
740
- int pktlen , len , i ;
738
+ int pktlen , len ;
741
739
char * addr = getenv ("REMOTE_ADDR" ), * port = getenv ("REMOTE_PORT" );
742
740
struct hostinfo hi = HOSTINFO_INIT ;
743
741
struct strvec env = STRVEC_INIT ;
@@ -758,7 +756,7 @@ static int execute(void)
758
756
if (len != pktlen )
759
757
parse_extra_args (& hi , & env , line + len + 1 , pktlen - len - 1 );
760
758
761
- for (i = 0 ; i < ARRAY_SIZE (daemon_service ); i ++ ) {
759
+ for (size_t i = 0 ; i < ARRAY_SIZE (daemon_service ); i ++ ) {
762
760
struct daemon_service * s = & (daemon_service [i ]);
763
761
const char * arg ;
764
762
@@ -1108,8 +1106,8 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
1108
1106
if (!listen_addr -> nr )
1109
1107
setup_named_sock (NULL , listen_port , socklist );
1110
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 ++ ) {
1113
1111
socknum = setup_named_sock (listen_addr -> items [i ].string ,
1114
1112
listen_port , socklist );
1115
1113
@@ -1123,20 +1121,17 @@ static void socksetup(struct string_list *listen_addr, int listen_port, struct s
1123
1121
static int service_loop (struct socketlist * socklist )
1124
1122
{
1125
1123
struct pollfd * pfd ;
1126
- int i ;
1127
1124
1128
1125
CALLOC_ARRAY (pfd , socklist -> nr );
1129
1126
1130
- for (i = 0 ; i < socklist -> nr ; i ++ ) {
1127
+ for (size_t i = 0 ; i < socklist -> nr ; i ++ ) {
1131
1128
pfd [i ].fd = socklist -> list [i ];
1132
1129
pfd [i ].events = POLLIN ;
1133
1130
}
1134
1131
1135
1132
signal (SIGCHLD , child_handler );
1136
1133
1137
1134
for (;;) {
1138
- int i ;
1139
-
1140
1135
check_dead_children ();
1141
1136
1142
1137
if (poll (pfd , socklist -> nr , -1 ) < 0 ) {
@@ -1148,7 +1143,7 @@ static int service_loop(struct socketlist *socklist)
1148
1143
continue ;
1149
1144
}
1150
1145
1151
- for (i = 0 ; i < socklist -> nr ; i ++ ) {
1146
+ for (size_t i = 0 ; i < socklist -> nr ; i ++ ) {
1152
1147
if (pfd [i ].revents & POLLIN ) {
1153
1148
union {
1154
1149
struct sockaddr sa ;
0 commit comments