From: Jani Taskinen Date: Sat, 21 Jul 2007 01:43:33 +0000 (+0000) Subject: MFH: Fixed compile warnings X-Git-Tag: php-5.2.4RC1~104 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d271071067688898b47236d18b4188264b6f2292;p=php MFH: Fixed compile warnings --- diff --git a/main/main.c b/main/main.c index a8a866b79e..967591d1cb 100644 --- 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 29b59e02fe..611213177a 100644 --- 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 9391d5fedb..849815c630 100644 --- 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 8f53384913..2a4bc86414 100755 --- 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 3bbcaae7d8..6dc5640425 100644 --- 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 50955f6229..3b26cd3e35 100644 --- 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; }