nlopess Sat Jul 1 11:35:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main fopen_wrappers.c fopen_wrappers.h network.c
safe_mode.c safe_mode.h
Log:
add const keywords
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3&r2=1.175.2.3.2.1&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175.2.3
php-src/main/fopen_wrappers.c:1.175.2.3.2.1
--- php-src/main/fopen_wrappers.c:1.175.2.3 Fri Mar 17 10:42:31 2006
+++ php-src/main/fopen_wrappers.c Sat Jul 1 11:35:34 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.175.2.3 2006/03/17 10:42:31 dmitry Exp $ */
+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.1 2006/07/01 11:35:34 nlopess Exp $ */
/* {{{ includes
*/
@@ -189,7 +189,7 @@
/* {{{ php_check_safe_mode_include_dir
*/
-PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC)
+PHPAPI int php_check_safe_mode_include_dir(const char *path TSRMLS_DC)
{
if (PG(safe_mode)) {
if (PG(safe_mode_include_dir) && *PG(safe_mode_include_dir)) {
@@ -239,7 +239,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;
@@ -356,7 +356,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;
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.h?r1=1.44.2.1&r2=1.44.2.1.2.1&diff_format=u
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.44.2.1
php-src/main/fopen_wrappers.h:1.44.2.1.2.1
--- php-src/main/fopen_wrappers.h:1.44.2.1 Sun Jan 1 12:50:17 2006
+++ php-src/main/fopen_wrappers.h Sat Jul 1 11:35:34 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.h,v 1.44.2.1 2006/01/01 12:50:17 sniper Exp $ */
+/* $Id: fopen_wrappers.h,v 1.44.2.1.2.1 2006/07/01 11:35:34 nlopess Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -31,9 +31,9 @@
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 int php_check_safe_mode_include_dir(char *path TSRMLS_DC);
+PHPAPI int php_check_safe_mode_include_dir(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.118.2.2&r2=1.118.2.2.2.1&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2 php-src/main/network.c:1.118.2.2.2.1
--- php-src/main/network.c:1.118.2.2 Sun Mar 19 22:33:10 2006
+++ php-src/main/network.c Sat Jul 1 11:35:34 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.118.2.2 2006/03/19 22:33:10 tony2001 Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.1 2006/07/01 11:35:34 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;
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.1&r2=1.62.2.1.2.2&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.1
php-src/main/safe_mode.c:1.62.2.1.2.2
--- php-src/main/safe_mode.c:1.62.2.1.2.1 Thu Jun 1 14:06:23 2006
+++ php-src/main/safe_mode.c Sat Jul 1 11:35:34 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.c,v 1.62.2.1.2.1 2006/06/01 14:06:23 tony2001 Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.2 2006/07/01 11:35:34 nlopess Exp $ */
#include "php.h"
@@ -45,7 +45,7 @@
* 5 - only check file
*/
-PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode,
int flags)
+PHPAPI int php_checkuid_ex(const char *filename, const char *fopen_mode, int
mode, int flags)
{
struct stat sb;
int ret, nofile=0;
@@ -186,7 +186,7 @@
return 0;
}
-PHPAPI int php_checkuid(const char *filename, 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;
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.h?r1=1.13.2.1&r2=1.13.2.1.2.1&diff_format=u
Index: php-src/main/safe_mode.h
diff -u php-src/main/safe_mode.h:1.13.2.1 php-src/main/safe_mode.h:1.13.2.1.2.1
--- php-src/main/safe_mode.h:1.13.2.1 Sun Jan 1 12:50:17 2006
+++ php-src/main/safe_mode.h Sat Jul 1 11:35:34 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.h,v 1.13.2.1 2006/01/01 12:50:17 sniper Exp $ */
+/* $Id: safe_mode.h,v 1.13.2.1.2.1 2006/07/01 11:35:34 nlopess Exp $ */
#ifndef SAFE_MODE_H
#define SAFE_MODE_H
@@ -33,8 +33,8 @@
#define CHECKUID_NO_ERRORS 0x01
BEGIN_EXTERN_C()
-PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode);
-PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode,
int flags);
+PHPAPI int php_checkuid(const char *filename, const char *fopen_mode, int
mode);
+PHPAPI int php_checkuid_ex(const char *filename, const char *fopen_mode, int
mode, int flags);
PHPAPI char *php_get_current_user(void);
END_EXTERN_C()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
