Skip to content

Commit f0b2a1f

Browse files
committed
Convert return values to bool in fpm_unix.c
The return value was always either 0 or -1
1 parent c9dccc9 commit f0b2a1f

File tree

5 files changed

+60
-58
lines changed

5 files changed

+60
-58
lines changed

sapi/fpm/fpm/fpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int t
5656
if (!fpm_php_init_main() ||
5757
!fpm_stdio_init_main() ||
5858
!fpm_conf_init_main(test_conf, force_daemon) ||
59-
0 > fpm_unix_init_main() ||
59+
!fpm_unix_init_main() ||
6060
!fpm_scoreboard_init_main() ||
6161
!fpm_pctl_init_main() ||
6262
!fpm_env_init_main() ||

sapi/fpm/fpm/fpm_children.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static void fpm_child_init(struct fpm_worker_pool_s *wp) /* {{{ */
152152
if (!fpm_stdio_init_child(wp) /* Note: this never fails */ ||
153153
!fpm_log_init_child(wp) ||
154154
!fpm_status_init_child(wp) ||
155-
0 > fpm_unix_init_child(wp) ||
155+
!fpm_unix_init_child(wp) ||
156156
!fpm_signals_init_child() ||
157157
!fpm_env_init_child(wp) /* Note: this never fails */ ||
158158
!fpm_php_init_child(wp) /* Note: this never fails */) {

sapi/fpm/fpm/fpm_sockets.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
242242

243243
umask(saved_umask);
244244

245-
if (0 > fpm_unix_set_socket_permissions(wp, path)) {
245+
if (!fpm_unix_set_socket_permissions(wp, path)) {
246246
close(sock);
247247
return -1;
248248
}
@@ -485,7 +485,7 @@ bool fpm_sockets_init_main(void)
485485
break;
486486

487487
case FPM_AF_UNIX :
488-
if (0 > fpm_unix_resolve_socket_permissions(wp)) {
488+
if (!fpm_unix_resolve_socket_permissions(wp)) {
489489
return false;
490490
}
491491
wp->listening_socket = fpm_socket_af_unix_listening_socket(wp);

0 commit comments

Comments
 (0)