Revert "Fix [-Wstrict-prototypes] warning in FPM SAPI"

Check if this is still needed

This reverts commit b888f65.

Author: Girgias

sapi/fpm/fpm/events/devpoll.h

@@ -20,6 +20,6 @@
 #include "../fpm_config.h"
 #include "../fpm_events.h"
 
-struct fpm_event_module_s *fpm_event_devpoll_module(void);
+struct fpm_event_module_s *fpm_event_devpoll_module();
 
 #endif /* FPM_EVENTS_DEVPOLL_H */

sapi/fpm/fpm/events/epoll.h

@@ -20,6 +20,6 @@
 #include "../fpm_config.h"
 #include "../fpm_events.h"
 
-struct fpm_event_module_s *fpm_event_epoll_module(void);
+struct fpm_event_module_s *fpm_event_epoll_module();
 
 #endif /* FPM_EVENTS_EPOLL_H */

sapi/fpm/fpm/events/kqueue.h

@@ -20,6 +20,6 @@
 #include "../fpm_config.h"
 #include "../fpm_events.h"
 
-struct fpm_event_module_s *fpm_event_kqueue_module(void);
+struct fpm_event_module_s *fpm_event_kqueue_module();
 
 #endif /* FPM_EVENTS_KQUEUE_H */

sapi/fpm/fpm/events/poll.h

@@ -20,6 +20,6 @@
 #include "../fpm_config.h"
 #include "../fpm_events.h"
 
-struct fpm_event_module_s *fpm_event_poll_module(void);
+struct fpm_event_module_s *fpm_event_poll_module();
 
 #endif /* FPM_EVENTS_POLL_H */

sapi/fpm/fpm/events/port.h

@@ -20,6 +20,6 @@
 #include "../fpm_config.h"
 #include "../fpm_events.h"
 
-struct fpm_event_module_s *fpm_event_port_module(void);
+struct fpm_event_module_s *fpm_event_port_module();
 
 #endif /* FPM_EVENTS_PORT_H */

sapi/fpm/fpm/events/select.h

@@ -20,6 +20,6 @@
 #include "../fpm_config.h"
 #include "../fpm_events.h"
 
-struct fpm_event_module_s *fpm_event_select_module(void);
+struct fpm_event_module_s *fpm_event_select_module();
 
 #endif /* FPM_EVENTS_SELECT_H */

sapi/fpm/fpm/fpm_children.h

@@ -12,8 +12,8 @@
 
 int fpm_children_create_initial(struct fpm_worker_pool_s *wp);
 int fpm_children_free(struct fpm_child_s *child);
-void fpm_children_bury(void);
-int fpm_children_init_main(void);
+void fpm_children_bury();
+int fpm_children_init_main();
 int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop, int nb_to_spawn, int is_debug);
 
 struct fpm_child_s;

sapi/fpm/fpm/fpm_clock.h

@@ -5,7 +5,7 @@
 
 #include <sys/time.h>
 
-int fpm_clock_init(void);
+int fpm_clock_init();
 int fpm_clock_get(struct timeval *tv);
 
 #endif

sapi/fpm/fpm/fpm_conf.h

@@ -117,7 +117,7 @@ enum {
 
 int fpm_conf_init_main(int test_conf, int force_daemon);
 int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc);
-int fpm_conf_write_pid(void);
-int fpm_conf_unlink_pid(void);
+int fpm_conf_write_pid();
+int fpm_conf_unlink_pid();
 
 #endif

sapi/fpm/fpm/fpm_env.h

@@ -8,7 +8,7 @@
 #define SETPROCTITLE_PREFIX "php-fpm: "
 
 int fpm_env_init_child(struct fpm_worker_pool_s *wp);
-int fpm_env_init_main(void);
+int fpm_env_init_main();
 void fpm_env_setproctitle(char *title);
 
 extern char **environ;
@@ -18,7 +18,7 @@ int setenv(char *name, char *value, int overwrite);
 #endif
 
 #ifndef HAVE_CLEARENV
-void clearenv(void);
+void clearenv();
 #endif
 
 #endif

sapi/fpm/fpm/fpm_events.h

@@ -39,12 +39,12 @@ struct fpm_event_module_s {
 
 void fpm_event_loop(int err);
 void fpm_event_fire(struct fpm_event_s *ev);
-int fpm_event_init_main(void);
+int fpm_event_init_main();
 int fpm_event_set(struct fpm_event_s *ev, int fd, int flags, void (*callback)(struct fpm_event_s *, short, void *), void *arg);
 int fpm_event_add(struct fpm_event_s *ev, unsigned long int timeout);
 int fpm_event_del(struct fpm_event_s *ev);
 int fpm_event_pre_init(char *machanism);
-const char *fpm_event_machanism_name(void);
-int fpm_event_support_edge_trigger(void);
+const char *fpm_event_machanism_name();
+int fpm_event_support_edge_trigger();
 
 #endif

sapi/fpm/fpm/fpm_php.h

@@ -38,8 +38,8 @@ char *fpm_php_request_method(void);
 char *fpm_php_query_string(void);
 char *fpm_php_auth_user(void);
 size_t fpm_php_content_length(void);
-void fpm_php_soft_quit(void);
-int fpm_php_init_main(void);
+void fpm_php_soft_quit();
+int fpm_php_init_main();
 int fpm_php_apply_defines_ex(struct key_value_s *kv, int mode);
 int fpm_php_limit_extensions(char *path);
 char* fpm_php_get_string_from_table(zend_string *table, char *key);

sapi/fpm/fpm/fpm_process_ctl.h

@@ -16,14 +16,14 @@
 struct fpm_child_s;
 
 void fpm_pctl(int new_state, int action);
-int fpm_pctl_can_spawn_children(void);
+int fpm_pctl_can_spawn_children();
 int fpm_pctl_kill(pid_t pid, int how);
 void fpm_pctl_kill_all(int signo);
 void fpm_pctl_heartbeat(struct fpm_event_s *ev, short which, void *arg);
 void fpm_pctl_perform_idle_server_maintenance_heartbeat(struct fpm_event_s *ev, short which, void *arg);
 void fpm_pctl_on_socket_accept(struct fpm_event_s *ev, short which, void *arg);
-int fpm_pctl_child_exited(void);
-int fpm_pctl_init_main(void);
+int fpm_pctl_child_exited();
+int fpm_pctl_init_main();
 
 
 enum {

sapi/fpm/fpm/fpm_request.h

@@ -3,12 +3,12 @@
 #ifndef FPM_REQUEST_H
 #define FPM_REQUEST_H 1
 
-void fpm_request_accepting(void);			/* hanging in accept() */
-void fpm_request_reading_headers(void);			/* start reading fastcgi request from very first byte */
-void fpm_request_info(void);				/* not a stage really but a point in the php code, where all request params have become known to sapi */
-void fpm_request_executing(void);			/* the script is executing */
+void fpm_request_accepting();				/* hanging in accept() */
+void fpm_request_reading_headers();			/* start reading fastcgi request from very first byte */
+void fpm_request_info();					/* not a stage really but a point in the php code, where all request params have become known to sapi */
+void fpm_request_executing();				/* the script is executing */
 void fpm_request_end(void);				/* request ended: script response have been sent to web server */
-void fpm_request_finished(void);			/* request processed: cleaning current request */
+void fpm_request_finished();				/* request processed: cleaning current request */
 
 struct fpm_child_s;
 struct timeval;

sapi/fpm/fpm/fpm_scoreboard.h

@@ -66,11 +66,11 @@ struct fpm_scoreboard_s {
 	struct fpm_scoreboard_proc_s *procs[];
 };
 
-int fpm_scoreboard_init_main(void);
+int fpm_scoreboard_init_main();
 int fpm_scoreboard_init_child(struct fpm_worker_pool_s *wp);
 
 void fpm_scoreboard_update(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);
-struct fpm_scoreboard_s *fpm_scoreboard_get(void);
+struct fpm_scoreboard_s *fpm_scoreboard_get();
 struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get(struct fpm_scoreboard_s *scoreboard, int child_index);
 
 struct fpm_scoreboard_s *fpm_scoreboard_acquire(struct fpm_scoreboard_s *scoreboard, int nohang);
@@ -86,7 +86,7 @@ void fpm_scoreboard_proc_free(struct fpm_scoreboard_s *scoreboard, int child_ind
 int fpm_scoreboard_proc_alloc(struct fpm_scoreboard_s *scoreboard, int *child_index);
 
 #ifdef HAVE_TIMES
-float fpm_scoreboard_get_tick(void);
+float fpm_scoreboard_get_tick();
 #endif
 
 #endif

sapi/fpm/fpm/fpm_shm.h

@@ -5,6 +5,6 @@
 
 void *fpm_shm_alloc(size_t size);
 int fpm_shm_free(void *mem, size_t size);
-size_t fpm_shm_get_size_allocated(void);
+size_t fpm_shm_get_size_allocated();
 
 #endif

sapi/fpm/fpm/fpm_signals.h

@@ -5,13 +5,13 @@
 
 #include <signal.h>
 
-int fpm_signals_init_main(void);
-int fpm_signals_init_child(void);
-int fpm_signals_get_fd(void);
-int fpm_signals_init_mask(void);
-int fpm_signals_block(void);
-int fpm_signals_child_block(void);
-int fpm_signals_unblock(void);
+int fpm_signals_init_main();
+int fpm_signals_init_child();
+int fpm_signals_get_fd();
+int fpm_signals_init_mask();
+int fpm_signals_block();
+int fpm_signals_child_block();
+int fpm_signals_unblock();
 
 extern const char *fpm_signal_names[NSIG + 1];
 

sapi/fpm/fpm/fpm_sockets.h

@@ -24,7 +24,7 @@
 #define FPM_ENV_SOCKET_SET_SIZE 128
 
 enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
-int fpm_sockets_init_main(void);
+int fpm_sockets_init_main();
 int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq);
 int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen);
 

sapi/fpm/fpm/fpm_stdio.h

@@ -7,10 +7,10 @@
 
 #define STREAM_SET_MSG_PREFIX_FMT "[pool %s] child %d said into %s: "
 
-int fpm_stdio_init_main(void);
-int fpm_stdio_init_final(void);
+int fpm_stdio_init_main();
+int fpm_stdio_init_final();
 int fpm_stdio_init_child(struct fpm_worker_pool_s *wp);
-int fpm_stdio_flush_child(void);
+int fpm_stdio_flush_child();
 int fpm_stdio_prepare_pipes(struct fpm_child_s *child);
 void fpm_stdio_child_use_pipes(struct fpm_child_s *child);
 int fpm_stdio_parent_use_pipes(struct fpm_child_s *child);

sapi/fpm/fpm/fpm_systemd.h

@@ -7,6 +7,6 @@
 #define FPM_SYSTEMD_DEFAULT_HEARTBEAT (10000)
 
 void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg);
-int fpm_systemd_conf(void);
+int fpm_systemd_conf();
 
 #endif

sapi/fpm/fpm/fpm_unix.h

@@ -10,7 +10,7 @@ int fpm_unix_set_socket_premissions(struct fpm_worker_pool_s *wp, const char *pa
 int fpm_unix_free_socket_premissions(struct fpm_worker_pool_s *wp);
 
 int fpm_unix_init_child(struct fpm_worker_pool_s *wp);
-int fpm_unix_init_main(void);
+int fpm_unix_init_main();
 
 extern size_t fpm_pagesize;
 

sapi/fpm/fpm/fpm_worker_pool.h

@@ -46,9 +46,9 @@ struct fpm_worker_pool_s {
 #endif
 };
 
-struct fpm_worker_pool_s *fpm_worker_pool_alloc(void);
+struct fpm_worker_pool_s *fpm_worker_pool_alloc();
 void fpm_worker_pool_free(struct fpm_worker_pool_s *wp);
-int fpm_worker_pool_init_main(void);
+int fpm_worker_pool_init_main();
 
 void fpm_worker_pool_free_limit_extensions(char **limit_extensions);