Convert return values to bool in fpm_scoreboard.c

The return value was always one of two values.

Author: Girgias

sapi/fpm/fpm/fpm.c

@@ -57,7 +57,7 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int t
 	    0 > fpm_stdio_init_main()         ||
 	    !fpm_conf_init_main(test_conf, force_daemon) ||
 	    0 > fpm_unix_init_main()          ||
-	    0 > fpm_scoreboard_init_main()    ||
+	    !fpm_scoreboard_init_main()    ||
 	    !fpm_pctl_init_main()          ||
 	    !fpm_env_init_main()           ||
 	    0 > fpm_signals_init_main()       ||

sapi/fpm/fpm/fpm_children.c

@@ -320,7 +320,7 @@ static struct fpm_child_s *fpm_resources_prepare(struct fpm_worker_pool_s *wp) /
 		return 0;
 	}
 
-	if (0 > fpm_scoreboard_proc_alloc(c)) {
+	if (!fpm_scoreboard_proc_alloc(c)) {
 		fpm_stdio_discard_pipes(c);
 		fpm_child_free(c);
 		return 0;

sapi/fpm/fpm/fpm_scoreboard.c

@@ -21,7 +21,7 @@ static float fpm_scoreboard_tick;
 #endif
 
 
-int fpm_scoreboard_init_main(void)
+bool fpm_scoreboard_init_main(void)
 {
 	struct fpm_worker_pool_s *wp;
 
@@ -45,19 +45,19 @@ int fpm_scoreboard_init_main(void)
 
 		if (wp->config->pm_max_children < 1) {
 			zlog(ZLOG_ERROR, "[pool %s] Unable to create scoreboard SHM because max_client is not set", wp->config->name);
-			return -1;
+			return false;
 		}
 
 		if (wp->scoreboard) {
 			zlog(ZLOG_ERROR, "[pool %s] Unable to create scoreboard SHM because it already exists", wp->config->name);
-			return -1;
+			return false;
 		}
 
 		scoreboard_procs_size = sizeof(struct fpm_scoreboard_proc_s) * wp->config->pm_max_children;
 		shm_mem = fpm_shm_alloc(sizeof(struct fpm_scoreboard_s) + scoreboard_procs_size);
 
 		if (!shm_mem) {
-			return -1;
+			return false;
 		}
 		wp->scoreboard = shm_mem;
 		wp->scoreboard->pm = wp->config->pm;
@@ -70,7 +70,7 @@ int fpm_scoreboard_init_main(void)
 			wp->scoreboard->shared = wp->shared->scoreboard;
 		}
 	}
-	return 0;
+	return true;
 }
 
 static struct fpm_scoreboard_s *fpm_scoreboard_get_for_update(struct fpm_scoreboard_s *scoreboard) /* {{{ */
@@ -392,15 +392,15 @@ void fpm_scoreboard_proc_free(struct fpm_child_s *child) /* {{{ */
 }
 /* }}} */
 
-int fpm_scoreboard_proc_alloc(struct fpm_child_s *child) /* {{{ */
+bool fpm_scoreboard_proc_alloc(struct fpm_child_s *child) /* {{{ */
 {
 	int i = -1;
 	struct fpm_worker_pool_s *wp = child->wp;
 	struct fpm_scoreboard_s *scoreboard = wp->scoreboard;
 	int nprocs = wp->config->pm_max_children;
 
 	if (!scoreboard) {
-		return -1;
+		return false;
 	}
 
 	/* first try the slot which is supposed to be free */
@@ -422,7 +422,7 @@ int fpm_scoreboard_proc_alloc(struct fpm_child_s *child) /* {{{ */
 	/* no free slot */
 	if (i < 0 || i >= nprocs) {
 		zlog(ZLOG_ERROR, "[pool %s] no free scoreboard slot", scoreboard->pool);
-		return -1;
+		return false;
 	}
 
 	scoreboard->procs[i].used = 1;
@@ -435,7 +435,7 @@ int fpm_scoreboard_proc_alloc(struct fpm_child_s *child) /* {{{ */
 		scoreboard->free_proc = i + 1;
 	}
 
-	return 0;
+	return true;
 }
 /* }}} */
 

sapi/fpm/fpm/fpm_scoreboard.h

@@ -70,8 +70,8 @@ struct fpm_scoreboard_s {
 	struct fpm_scoreboard_proc_s procs[];
 };
 
-int fpm_scoreboard_init_main(void);
-int fpm_scoreboard_init_child(struct fpm_worker_pool_s *wp);
+bool fpm_scoreboard_init_main(void);
+int fpm_scoreboard_init_child(struct fpm_worker_pool_s *wp); /* TODO Define this function? */
 
 void fpm_scoreboard_update_begin(struct fpm_scoreboard_s *scoreboard);
 void fpm_scoreboard_update_commit(int idle, int active, int lq, int lq_len, int requests, int max_children_reached, int slow_rq, int action, struct fpm_scoreboard_s *scoreboard);
@@ -91,7 +91,7 @@ void fpm_scoreboard_free(struct fpm_worker_pool_s *wp);
 void fpm_scoreboard_child_use(struct fpm_child_s *child, pid_t pid);
 
 void fpm_scoreboard_proc_free(struct fpm_child_s *child);
-int fpm_scoreboard_proc_alloc(struct fpm_child_s *child);
+bool fpm_scoreboard_proc_alloc(struct fpm_child_s *child);
 
 struct fpm_scoreboard_s *fpm_scoreboard_copy(struct fpm_scoreboard_s *scoreboard, int copy_procs);
 void fpm_scoreboard_free_copy(struct fpm_scoreboard_s *scoreboard);