Fix -Wstrict-prototypes warnings

gaborcsardi · gaborcsardi · commit 7a5d338cb6c3 · 2022-10-08T17:36:03.000Z
diff --git a/inst/include/processx/unix-sockets.c b/inst/include/processx/unix-sockets.c
@@ -115,7 +115,7 @@ PROCESSX_STATIC int processx_socket_close(processx_socket_t *pxsocket) {
 #endif
 }
 
-PROCESSX_STATIC const char* processx_socket_error_message() {
+PROCESSX_STATIC const char* processx_socket_error_message(void) {
 #ifdef _WIN32
 #define ERRORBUF_SIZE 4096
   static char errorbuf[ERRORBUF_SIZE];
diff --git a/inst/include/processx/unix-sockets.h b/inst/include/processx/unix-sockets.h
@@ -33,7 +33,7 @@ PROCESSX_STATIC ssize_t processx_socket_write(processx_socket_t *pxsocket,
                                               void *buf,
                                               size_t nbyte);
 PROCESSX_STATIC int processx_socket_close(processx_socket_t *pxsocket);
-PROCESSX_STATIC const char* processx_socket_error_message();
+PROCESSX_STATIC const char* processx_socket_error_message(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/cleancall.c b/src/cleancall.c
@@ -35,7 +35,7 @@ void cleancall_SetExternalPtrAddrFn(SEXP s, DL_FUNC p) {
 // Initialised at load time with the `.Call` primitive
 SEXP cleancall_fns_dot_call = NULL;
 
-void cleancall_init() {
+void cleancall_init(void) {
   cleancall_fns_dot_call = Rf_findVar(Rf_install(".Call"), R_BaseEnv);
 }
 
diff --git a/src/cleancall.h b/src/cleancall.h
@@ -28,7 +28,7 @@ void cleancall_SetExternalPtrAddrFn(SEXP s, DL_FUNC p);
 
 SEXP cleancall_call(SEXP args, SEXP env);
 extern SEXP cleancall_fns_dot_call;
-void cleancall_init();
+void cleancall_init(void);
 
 // --------------------------------------------------------------------
 // Public API
diff --git a/src/client.c b/src/client.c
@@ -126,7 +126,7 @@ static int processx__cloexec_fcntl(int fd, int set) {
   return 0;
 }
 
-SEXP processx_disable_inheritance() {
+SEXP processx_disable_inheritance(void) {
   int fd;
 
   /* Set the CLOEXEC flag on all open descriptors. Unconditionally try the
diff --git a/src/create-time.c b/src/create-time.c
@@ -169,7 +169,7 @@ void *processx__memmem(const void *haystack, size_t n1,
   return NULL;
 }
 
-double processx__boot_time() {
+double processx__boot_time(void) {
   return processx__linux_boot_time;
 }
 
diff --git a/src/init.c b/src/init.c
@@ -5,12 +5,12 @@
 #include <R_ext/Rdynload.h>
 #include <R.h>
 
-void R_init_processx_win();
-void R_init_processx_unix();
-SEXP processx__unload_cleanup();
-SEXP run_testthat_tests();
-SEXP processx__echo_on();
-SEXP processx__echo_off();
+void R_init_processx_win(void);
+void R_init_processx_unix(void);
+SEXP processx__unload_cleanup(void);
+SEXP run_testthat_tests(void);
+SEXP processx__echo_on(void);
+SEXP processx__echo_off(void);
 SEXP processx__set_boot_time(SEXP);
 
 static const R_CallMethodDef callMethods[]  = {
diff --git a/src/processx-connection.c b/src/processx-connection.c
@@ -727,7 +727,7 @@ SEXP processx_connection_disable_inheritance() {
 
 #else
 
-SEXP processx_connection_disable_inheritance() {
+SEXP processx_connection_disable_inheritance(void) {
   int fd;
 
   /* Set the CLOEXEC flag on all open descriptors. Unconditionally try the
diff --git a/src/processx-connection.h b/src/processx-connection.h
@@ -178,15 +178,15 @@ SEXP processx_is_closed(SEXP con);
 SEXP processx_connection_poll(SEXP pollables, SEXP timeout);
 
 /* Functions for connection inheritance */
-SEXP processx_connection_create_pipepair();
+SEXP processx_connection_create_pipepair(SEXP encoding, SEXP nonblocking);
 
 SEXP processx_connection_set_stdout(SEXP con, SEXP drop);
 
 SEXP processx_connection_set_stderr(SEXP con, SEXP drop);
 
 SEXP processx_connection_get_fileno(SEXP con);
 
-SEXP processx_connection_disable_inheritance();
+SEXP processx_connection_disable_inheritance(void);
 
 SEXP processx_is_valid_fd(SEXP fd);
 
diff --git a/src/processx.h b/src/processx.h
@@ -60,14 +60,14 @@ SEXP processx_poll(SEXP statuses, SEXP conn, SEXP ms);
 
 SEXP processx__process_exists(SEXP pid);
 SEXP processx__proc_start_time(SEXP status);
-SEXP processx__unload_cleanup();
+SEXP processx__unload_cleanup(void);
 
 SEXP processx_is_named_pipe_open(SEXP pipe_ext);
 SEXP processx_close_named_pipe(SEXP pipe_ext);
 SEXP processx_create_named_pipe(SEXP name, SEXP mode);
 SEXP processx_write_named_pipe(SEXP pipe_ext, SEXP text);
 
-SEXP processx_disable_crash_dialog();
+SEXP processx_disable_crash_dialog(void);
 
 SEXP processx_base64_encode(SEXP array);
 SEXP processx_base64_decode(SEXP array);
diff --git a/src/supervisor/supervisor.c b/src/supervisor/supervisor.c
@@ -141,7 +141,7 @@ bool pid_is_running(pid_t pid) {
 
 // Send a soft kill signal to all children, wait 5 seconds, then hard kill any
 // remaining processes.
-void kill_children() {
+void kill_children(void) {
     if (n_children == 0)
         return;
 
diff --git a/src/tools/px.c b/src/tools/px.c
@@ -16,7 +16,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-void usage() {
+void usage(void) {
   fprintf(stderr, "Usage: px [command arg] [command arg] ...\n\n");
   fprintf(stderr, "Commands:\n");
   fprintf(stderr, "  sleep  <seconds>           -- "
diff --git a/src/unix/childlist.c b/src/unix/childlist.c
@@ -14,7 +14,7 @@ void processx__freelist_add(processx__child_list_t *ptr) {
 /* This is not a race condition with the SIGCHLD handler, because this
    function is only called with the handler blocked, from processx.c */
 
-void processx__freelist_free() {
+void processx__freelist_free(void) {
   processx__child_list_t *ptr = child_free_list->next;
   while (ptr) {
     processx__child_list_t *next = ptr->next;
@@ -77,7 +77,7 @@ processx__child_list_t *processx__child_find(pid_t pid) {
 
 /* LCOV_EXCL_STOP */
 
-SEXP processx__unload_cleanup() {
+SEXP processx__unload_cleanup(void) {
   processx__child_list_t *ptr = child_list->next;
   int killed = 0;
 
diff --git a/src/unix/processx-unix.h b/src/unix/processx-unix.h
@@ -33,10 +33,10 @@ char **processx__tmp_character(SEXP chr);
 
 extern pthread_t processx__main_thread;
 void processx__sigchld_callback(int sig, siginfo_t *info, void *ctx);
-void processx__setup_sigchld();
-void processx__remove_sigchld();
-void processx__block_sigchld();
-void processx__unblock_sigchld();
+void processx__setup_sigchld(void);
+void processx__remove_sigchld(void);
+void processx__block_sigchld(void);
+void processx__unblock_sigchld(void);
 
 void processx__finalizer(SEXP status);
 
@@ -52,7 +52,7 @@ int processx__child_add(pid_t pid, SEXP status);
 void processx__child_remove(pid_t pid);
 processx__child_list_t *processx__child_find(pid_t pid);
 void processx__freelist_add(processx__child_list_t *ptr);
-void processx__freelist_free();
+void processx__freelist_free(void);
 
 void processx__collect_exit_status(SEXP status, int retval, int wstat);
 
diff --git a/src/unix/processx.c b/src/unix/processx.c
@@ -63,7 +63,7 @@ extern int processx__notify_old_sigchld_handler;
    properly set to their initial values after a library (re)load.
    This function is called from `R_init_processx`. */
 
-void R_init_processx_unix() {
+void R_init_processx_unix(void) {
   processx__main_thread = pthread_self();
 
   child_list_head.pid = 0;
diff --git a/src/unix/sigchld.c b/src/unix/sigchld.c
@@ -108,7 +108,7 @@ void processx__sigchld_callback(int sig, siginfo_t *info, void *ctx) {
   errno = saved_errno;
 }
 
-void processx__setup_sigchld() {
+void processx__setup_sigchld(void) {
   struct sigaction action;
   struct sigaction old;
   memset(&action, 0, sizeof(action));
@@ -120,15 +120,15 @@ void processx__setup_sigchld() {
   }
 }
 
-void processx__remove_sigchld() {
+void processx__remove_sigchld(void) {
   struct sigaction action;
   memset(&action, 0, sizeof(action));
   action.sa_handler = SIG_DFL;
   sigaction(SIGCHLD, &action, &old_sig_handler);
   memset(&old_sig_handler, 0, sizeof(old_sig_handler));
 }
 
-void processx__block_sigchld() {
+void processx__block_sigchld(void) {
   sigset_t blockMask;
   sigemptyset(&blockMask);
   sigaddset(&blockMask, SIGCHLD);
@@ -137,7 +137,7 @@ void processx__block_sigchld() {
   }
 }
 
-void processx__unblock_sigchld() {
+void processx__unblock_sigchld(void) {
   sigset_t unblockMask;
   sigemptyset(&unblockMask);
   sigaddset(&unblockMask, SIGCHLD);
diff --git a/src/unix/utils.c b/src/unix/utils.c
@@ -57,7 +57,7 @@ int processx__cloexec_fcntl(int fd, int set) {
   return 0;
 }
 
-SEXP processx_disable_crash_dialog() {
+SEXP processx_disable_crash_dialog(void) {
   struct sigaction action;
   memset(&action, 0, sizeof(action));
   action.sa_handler = SIG_DFL;
@@ -69,7 +69,7 @@ SEXP processx_disable_crash_dialog() {
   return R_NilValue;
 }
 
-SEXP processx__echo_on() {
+SEXP processx__echo_on(void) {
   struct termios tp;
 
   if (tcgetattr(STDOUT_FILENO, &tp) == -1) {
@@ -85,7 +85,7 @@ SEXP processx__echo_on() {
   return R_NilValue;
 }
 
-SEXP processx__echo_off() {
+SEXP processx__echo_off(void) {
   struct termios tp;
 
   if (tcgetattr(STDOUT_FILENO, &tp) == -1) {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ PROCESSX_STATIC int processx_socket_close(processx_socket_t *pxsocket) {`
`115`	`115`	`#endif`
`116`	`116`	`}`
`117`	`117`
`118`		`-PROCESSX_STATIC const char* processx_socket_error_message() {`
	`118`	`+PROCESSX_STATIC const char* processx_socket_error_message(void) {`
`119`	`119`	`#ifdef _WIN32`
`120`	`120`	`#define ERRORBUF_SIZE 4096`
`121`	`121`	`static char errorbuf[ERRORBUF_SIZE];`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ PROCESSX_STATIC ssize_t processx_socket_write(processx_socket_t *pxsocket,`
`33`	`33`	`void *buf,`
`34`	`34`	`size_t nbyte);`
`35`	`35`	`PROCESSX_STATIC int processx_socket_close(processx_socket_t *pxsocket);`
`36`		`-PROCESSX_STATIC const char* processx_socket_error_message();`
	`36`	`+PROCESSX_STATIC const char* processx_socket_error_message(void);`
`37`	`37`
`38`	`38`	`#ifdef __cplusplus`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void cleancall_SetExternalPtrAddrFn(SEXP s, DL_FUNC p) {`
`35`	`35`	// Initialised at load time with the `.Call` primitive
`36`	`36`	`SEXP cleancall_fns_dot_call = NULL;`
`37`	`37`
`38`		`-void cleancall_init() {`
	`38`	`+void cleancall_init(void) {`
`39`	`39`	`cleancall_fns_dot_call = Rf_findVar(Rf_install(".Call"), R_BaseEnv);`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ static int processx__cloexec_fcntl(int fd, int set) {`
`126`	`126`	`return 0;`
`127`	`127`	`}`
`128`	`128`
`129`		`-SEXP processx_disable_inheritance() {`
	`129`	`+SEXP processx_disable_inheritance(void) {`
`130`	`130`	`int fd;`
`131`	`131`
`132`	`132`	`/* Set the CLOEXEC flag on all open descriptors. Unconditionally try the`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ void processx__memmem(const void haystack, size_t n1,`
`169`	`169`	`return NULL;`
`170`	`170`	`}`
`171`	`171`
`172`		`-double processx__boot_time() {`
	`172`	`+double processx__boot_time(void) {`
`173`	`173`	`return processx__linux_boot_time;`
`174`	`174`	`}`
`175`	`175`