MFH: Fixed compile warnings

diff --git a/main/main.c b/main/main.c
index a8a866b79e92f014a980de36e3a5d49b7219734b..967591d1cb2afe94a9e17c6ba973a8e2ed29468f 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -420,14 +420,14 @@ PHPAPI int php_printf(const char *format, ...)
 /* {{{ php_verror helpers */
 
 /* {{{ php_during_module_startup */
-static int php_during_module_startup()
+static int php_during_module_startup(void)
 {
        return module_startup;
 }
 /* }}} */
 
 /* {{{ php_during_module_shutdown */
-static int php_during_module_shutdown()
+static int php_during_module_shutdown(void)
 {
        return module_shutdown;
 }
@@ -1717,7 +1717,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 }
 /* }}} */
 
-void php_module_shutdown_for_exec()
+void php_module_shutdown_for_exec(void)
 {
        /* used to close fd's in the range 3.255 here, but it's problematic */
 }
@@ -2009,7 +2009,7 @@ PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
 #ifdef PHP_WIN32
 /* {{{ dummy_indent
    just so that this symbol gets exported... */
-PHPAPI void dummy_indent()
+PHPAPI void dummy_indent(void)
 {
        zend_indent();
 }

diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index 29b59e02fefac6d0f02f2743d9386276709d6a52..611213177aa9f4add4b339f7166983b9aa0dbc81 100644 (file)
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -151,7 +151,7 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char **
 /* Cache the chosen temporary directory. */
 static char* temporary_directory;
 
-PHPAPI void php_shutdown_temporary_directory()
+PHPAPI void php_shutdown_temporary_directory(void)
 {
        if (temporary_directory) {
                free(temporary_directory);

diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h
index 9391d5fedb07076507a7f6cc6e05ca8d8a013335..849815c630e12ad96cf8cee2d6a88c170adf0b3d 100644 (file)
--- a/main/php_open_temporary_file.h
+++ b/main/php_open_temporary_file.h
@@ -26,7 +26,7 @@ PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **op
 PHPAPI int php_open_temporary_fd_ex(const char *dir, const char *pfx, char **opened_path_p, zend_bool open_basedir_check TSRMLS_DC);
 PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC);
 PHPAPI const char *php_get_temporary_directory(void);
-PHPAPI void php_shutdown_temporary_directory();
+PHPAPI void php_shutdown_temporary_directory(void);
 END_EXTERN_C()
 
 #endif /* PHP_OPEN_TEMPORARY_FILE_H */

diff --git a/main/php_streams.h b/main/php_streams.h
index 8f53384913b3b85d94427ca2b17f81e1ef7af15e..2a4bc86414d2bd35011505f5a58b43c9ae6edf4a 100755 (executable)
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -549,7 +549,7 @@ PHPAPI HashTable *_php_stream_get_url_stream_wrappers_hash(TSRMLS_D);
 PHPAPI HashTable *php_stream_get_url_stream_wrappers_hash_global(void);
 PHPAPI HashTable *_php_get_stream_filters_hash(TSRMLS_D);
 #define php_get_stream_filters_hash()  _php_get_stream_filters_hash(TSRMLS_C)
-PHPAPI HashTable *php_get_stream_filters_hash_global();
+PHPAPI HashTable *php_get_stream_filters_hash_global(void);
 END_EXTERN_C()
 #endif
 

diff --git a/main/safe_mode.c b/main/safe_mode.c
index 3bbcaae7d833e87a8c6eaf1d0a82e6e72c89cf96..6dc5640425a551bdddc24924c48263d1e4120f54 100644 (file)
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -188,7 +188,8 @@ PHPAPI int php_checkuid_ex(const char *filename, const char *fopen_mode, int mod
        return 0;
 }
 
-PHPAPI int php_checkuid(const char *filename, const char *fopen_mode, int mode) {
+PHPAPI int php_checkuid(const char *filename, const char *fopen_mode, int mode)
+{
 #ifdef NETWARE
 /* NetWare don't have uid*/
        return 1;
@@ -197,7 +198,7 @@ PHPAPI int php_checkuid(const char *filename, const char *fopen_mode, int mode)
 #endif
 }
 
-PHPAPI char *php_get_current_user()
+PHPAPI char *php_get_current_user(void)
 {
        struct stat *pstat;
        TSRMLS_FETCH();

diff --git a/main/streams/filter.c b/main/streams/filter.c
index 50955f622977804126f312fb39c4df75af823670..3b26cd3e35ca3eaab475f068809d73850d357930 100644 (file)
--- a/main/streams/filter.c
+++ b/main/streams/filter.c
@@ -32,7 +32,7 @@
 static HashTable stream_filters_hash;
 
 /* Should only be used during core initialization */
-PHPAPI HashTable *php_get_stream_filters_hash_global()
+PHPAPI HashTable *php_get_stream_filters_hash_global(void)
 {
        return &stream_filters_hash;
 }