jani Sat Jul 21 01:43:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c php_open_temporary_file.c
php_open_temporary_file.h php_streams.h safe_mode.c
/php-src/main/streams filter.c
Log:
MFH: Fixed compile warnings
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.46&r2=1.640.2.23.2.47&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.46 php-src/main/main.c:1.640.2.23.2.47
--- php-src/main/main.c:1.640.2.23.2.46 Sun Jul 15 15:34:28 2007
+++ php-src/main/main.c Sat Jul 21 01:43:33 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.46 2007/07/15 15:34:28 jani Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.47 2007/07/21 01:43:33 jani Exp $ */
/* {{{ includes
*/
@@ -420,14 +420,14 @@
/* {{{ 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 @@
}
/* }}} */
-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 @@
#ifdef PHP_WIN32
/* {{{ dummy_indent
just so that this symbol gets exported... */
-PHPAPI void dummy_indent()
+PHPAPI void dummy_indent(void)
{
zend_indent();
}
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.c?r1=1.34.2.1.2.8&r2=1.34.2.1.2.9&diff_format=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.34.2.1.2.8
php-src/main/php_open_temporary_file.c:1.34.2.1.2.9
--- php-src/main/php_open_temporary_file.c:1.34.2.1.2.8 Tue Jul 17 23:46:40 2007
+++ php-src/main/php_open_temporary_file.c Sat Jul 21 01:43:33 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.8 2007/07/17 23:46:40 iliaa Exp
$ */
+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.9 2007/07/21 01:43:33 jani Exp
$ */
#include "php.h"
@@ -151,7 +151,7 @@
/* 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);
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.h?r1=1.13.2.1.2.3&r2=1.13.2.1.2.4&diff_format=u
Index: php-src/main/php_open_temporary_file.h
diff -u php-src/main/php_open_temporary_file.h:1.13.2.1.2.3
php-src/main/php_open_temporary_file.h:1.13.2.1.2.4
--- php-src/main/php_open_temporary_file.h:1.13.2.1.2.3 Tue Jul 17 23:46:40 2007
+++ php-src/main/php_open_temporary_file.h Sat Jul 21 01:43:33 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_open_temporary_file.h,v 1.13.2.1.2.3 2007/07/17 23:46:40 iliaa Exp
$ */
+/* $Id: php_open_temporary_file.h,v 1.13.2.1.2.4 2007/07/21 01:43:33 jani Exp
$ */
#ifndef PHP_OPEN_TEMPORARY_FILE_H
#define PHP_OPEN_TEMPORARY_FILE_H
@@ -26,7 +26,7 @@
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 */
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.103.2.1.2.3&r2=1.103.2.1.2.4&diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.103.2.1.2.3
php-src/main/php_streams.h:1.103.2.1.2.4
--- php-src/main/php_streams.h:1.103.2.1.2.3 Mon Jul 9 17:27:23 2007
+++ php-src/main/php_streams.h Sat Jul 21 01:43:33 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_streams.h,v 1.103.2.1.2.3 2007/07/09 17:27:23 dmitry Exp $ */
+/* $Id: php_streams.h,v 1.103.2.1.2.4 2007/07/21 01:43:33 jani Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -549,7 +549,7 @@
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
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.8&r2=1.62.2.1.2.9&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.8
php-src/main/safe_mode.c:1.62.2.1.2.9
--- php-src/main/safe_mode.c:1.62.2.1.2.8 Fri Jan 12 12:11:18 2007
+++ php-src/main/safe_mode.c Sat Jul 21 01:43:33 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.c,v 1.62.2.1.2.8 2007/01/12 12:11:18 bjori Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.9 2007/07/21 01:43:33 jani Exp $ */
#include "php.h"
@@ -188,7 +188,8 @@
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 @@
#endif
}
-PHPAPI char *php_get_current_user()
+PHPAPI char *php_get_current_user(void)
{
struct stat *pstat;
TSRMLS_FETCH();
http://cvs.php.net/viewvc.cgi/php-src/main/streams/filter.c?r1=1.17.2.3.2.9&r2=1.17.2.3.2.10&diff_format=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.17.2.3.2.9
php-src/main/streams/filter.c:1.17.2.3.2.10
--- php-src/main/streams/filter.c:1.17.2.3.2.9 Mon Jan 15 17:07:07 2007
+++ php-src/main/streams/filter.c Sat Jul 21 01:43:33 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.17.2.3.2.9 2007/01/15 17:07:07 tony2001 Exp $ */
+/* $Id: filter.c,v 1.17.2.3.2.10 2007/07/21 01:43:33 jani Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
