nlopess Sat Jul 1 11:50:52 2006 UTC
Modified files:
/php-src/main fopen_wrappers.c fopen_wrappers.h network.c
Log:
MFB5.2: const keywording
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.182&r2=1.183&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.182 php-src/main/fopen_wrappers.c:1.183
--- php-src/main/fopen_wrappers.c:1.182 Fri Mar 17 10:46:02 2006
+++ php-src/main/fopen_wrappers.c Sat Jul 1 11:50:52 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.182 2006/03/17 10:46:02 dmitry Exp $ */
+/* $Id: fopen_wrappers.c,v 1.183 2006/07/01 11:50:52 nlopess Exp $ */
/* {{{ includes
*/
@@ -189,7 +189,7 @@
/* {{{ php_fopen_and_set_opened_path
*/
-static FILE *php_fopen_and_set_opened_path(const char *path, char *mode, char
**opened_path TSRMLS_DC)
+static FILE *php_fopen_and_set_opened_path(const char *path, const char *mode,
char **opened_path TSRMLS_DC)
{
FILE *fp;
@@ -306,7 +306,7 @@
* Tries to open a file with a PATH-style list of directories.
* If the filename starts with "." or "/", the path is ignored.
*/
-PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char
**opened_path TSRMLS_DC)
+PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const
char *path, char **opened_path TSRMLS_DC)
{
char *pathbuf, *ptr, *end;
char *exec_fname;
@@ -331,7 +331,7 @@
return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
}
- /* Absolute path open */
+ /* Absolute path open */
/* FIXME: Andi - Do we actually need the if()? */
if (IS_ABSOLUTE_PATH(filename, filename_length) || (!path || (path &&
!*path))) {
return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.h?r1=1.46&r2=1.47&diff_format=u
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.46 php-src/main/fopen_wrappers.h:1.47
--- php-src/main/fopen_wrappers.h:1.46 Sun Feb 19 01:19:37 2006
+++ php-src/main/fopen_wrappers.h Sat Jul 1 11:50:52 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.h,v 1.46 2006/02/19 01:19:37 andi Exp $ */
+/* $Id: fopen_wrappers.h,v 1.47 2006/07/01 11:50:52 nlopess Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -31,7 +31,7 @@
PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
PHPAPI int php_check_specific_open_basedir(const char *basedir, const char
*path TSRMLS_DC);
-PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char
**opened_path TSRMLS_DC);
+PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const
char *path, char **opened_path TSRMLS_DC);
PHPAPI int php_is_url(char *path);
PHPAPI char *php_strip_url_passwd(char *path);
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.121&r2=1.122&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.121 php-src/main/network.c:1.122
--- php-src/main/network.c:1.121 Sun Mar 19 22:34:26 2006
+++ php-src/main/network.c Sat Jul 1 11:50:52 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.121 2006/03/19 22:34:26 tony2001 Exp $ */
+/* $Id: network.c,v 1.122 2006/07/01 11:50:52 nlopess Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -103,7 +103,7 @@
# define PHP_GAI_STRERROR(x) (php_gai_strerror(x))
/* {{{ php_gai_strerror
*/
-static char *php_gai_strerror(int code)
+static const char *php_gai_strerror(int code)
{
static struct {
int code;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
