Skip to content

Commit bf93730

Browse files
committed
Convert return value to bool for fpm_worker_pool_init_main()
The return value was always either 0 or -1
1 parent f0b2a1f commit bf93730

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

sapi/fpm/fpm/fpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int t
6363
!fpm_signals_init_main() ||
6464
!fpm_children_init_main() ||
6565
!fpm_sockets_init_main() ||
66-
0 > fpm_worker_pool_init_main() ||
66+
!fpm_worker_pool_init_main() ||
6767
!fpm_event_init_main()) {
6868

6969
if (fpm_globals.test_successful) {

sapi/fpm/fpm/fpm_worker_pool.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,7 @@ struct fpm_worker_pool_s *fpm_worker_pool_alloc(void)
7878
return ret;
7979
}
8080

81-
int fpm_worker_pool_init_main(void)
81+
bool fpm_worker_pool_init_main(void)
8282
{
83-
if (!fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_worker_pool_cleanup, 0)) {
84-
return -1;
85-
}
86-
return 0;
83+
return fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_worker_pool_cleanup, 0);
8784
}

sapi/fpm/fpm/fpm_worker_pool.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#ifndef FPM_WORKER_POOL_H
44
#define FPM_WORKER_POOL_H 1
55

6+
#include <stdbool.h>
67
#include "fpm_conf.h"
78
#include "fpm_shm.h"
89

@@ -49,7 +50,7 @@ struct fpm_worker_pool_s {
4950

5051
struct fpm_worker_pool_s *fpm_worker_pool_alloc(void);
5152
void fpm_worker_pool_free(struct fpm_worker_pool_s *wp);
52-
int fpm_worker_pool_init_main(void);
53+
bool fpm_worker_pool_init_main(void);
5354

5455
void fpm_worker_pool_free_limit_extensions(char **limit_extensions);
5556

0 commit comments

Comments
 (0)