Skip to content

Change return values to bool or void in FPM #9911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft

Change return values to bool or void in FPM #9911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
287eb5e
Use bool instead of int as return value for FPM status functions
Girgias Nov 8, 2022
f88e57e
Change return type of fpm_children_free() to void
Girgias Nov 8, 2022
c9ab06e
Change return type of fpm_children_init_main() to bool
Girgias Nov 8, 2022
b14200d
Change return type of fpm_cleanup_add() to bool
Girgias Nov 8, 2022
2cdc254
Change return type of fpm_clock_init() to bool
Girgias Nov 8, 2022
2429199
Convert return value to bool or void in fpm_conf.c
Girgias Nov 8, 2022
b1a3d45
Convert return value to bool or void in fpm_env.c
Girgias Nov 8, 2022
931b51d
Convert return values to bool in fpm_events.c
Girgias Nov 8, 2022
df335e9
Convert return values to bool in fpm_log.c
Girgias Nov 8, 2022
0d26974
Convert return values to bool in fpm_php.c
Girgias Nov 8, 2022
a59a942
Change return type of fpm_php_trace_dump() to bool
Girgias Nov 8, 2022
1c5b9c8
Convert return value to bool or void in fpm_process_ctl.c
Girgias Nov 8, 2022
7c8c7dc
Convert return values to bool in fpm_request.c
Girgias Nov 8, 2022
9eae86b
Convert return values to bool in fpm_scoreboard.c
Girgias Nov 8, 2022
7e84171
Formalize return type of fpm_shm_free() to bool
Girgias Nov 8, 2022
84b1372
Convert return values to bool in fpm_signals.c
Girgias Nov 8, 2022
ff7c729
Convert return values to bool in fpm_sockets.c
Girgias Nov 8, 2022
f30a758
Convert return value to bool or void in fpm_stdio.c
Girgias Nov 8, 2022
1d00cf0
Make return type of fpm_systemd_conf() void
Girgias Nov 8, 2022
c9dccc9
Convert return values to bool in fpm_trace.c files
Girgias Nov 8, 2022
f0b2a1f
Convert return values to bool in fpm_unix.c
Girgias Nov 8, 2022
bf93730
Convert return value to bool for fpm_worker_pool_init_main()
Girgias Nov 8, 2022
21023b4
Convert return value to bool for fpm_init()
Girgias Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert return values to bool in fpm_unix.c 
The return value was always either 0 or -1
  • Loading branch information
@Girgias
Girgias committed Nov 9, 2022
commit f0b2a1ff19d5d17b031e3e93ce18cbca683144dd
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int t
if (!fpm_php_init_main() ||
!fpm_stdio_init_main() ||
!fpm_conf_init_main(test_conf, force_daemon) ||
0 > fpm_unix_init_main() ||
!fpm_unix_init_main() ||
!fpm_scoreboard_init_main() ||
!fpm_pctl_init_main() ||
!fpm_env_init_main() ||
Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm_children.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static void fpm_child_init(struct fpm_worker_pool_s *wp) /* {{{ */
if (!fpm_stdio_init_child(wp) /* Note: this never fails */ ||
!fpm_log_init_child(wp) ||
!fpm_status_init_child(wp) ||
0 > fpm_unix_init_child(wp) ||
!fpm_unix_init_child(wp) ||
!fpm_signals_init_child() ||
!fpm_env_init_child(wp) /* Note: this never fails */ ||
!fpm_php_init_child(wp) /* Note: this never fails */) {
Expand Down
4 changes: 2 additions & 2 deletions sapi/fpm/fpm/fpm_sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct

umask(saved_umask);

if (0 > fpm_unix_set_socket_permissions(wp, path)) {
if (!fpm_unix_set_socket_permissions(wp, path)) {
close(sock);
return -1;
}
Expand Down Expand Up @@ -485,7 +485,7 @@ bool fpm_sockets_init_main(void)
break;

case FPM_AF_UNIX :
if (0 > fpm_unix_resolve_socket_permissions(wp)) {
if (!fpm_unix_resolve_socket_permissions(wp)) {
return false;
}
wp->listening_socket = fpm_socket_af_unix_listening_socket(wp);
Expand Down
Loading