cvs: php4(PHP_4_2_0) /ext/standard reg.c /main fopen_wrappers.c fopen_wrappers.h

zeev Fri Aug 23 04:00:50 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/standard reg.c /php4/main fopen_wrappers.c fopen_wrappers.h Log: Fix a few warnings (MFH) Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.58.2.2 php4/ext/standard/reg.c:1.58.2.3 --- php4/ext/standard/reg.c:1.58.2.2 Mon Jun 17 11:11:39 2002 +++ php4/ext/standard/reg.c Fri Aug 23 04:00:48 2002 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.58.2.2 2002/06/17 15:11:39 andrei Exp $ */ +/* $Id: reg.c,v 1.58.2.3 2002/08/23 08:00:48 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -341,7 +341,7 @@ while (*walk) if ('\\' == *walk && '0' <= walk[1] && '9' >= walk[1] - && walk[1] - '0' <= re.re_nsub + && walk[1] - '0' <= ((char) re.re_nsub) && subs[walk[1] - '0'].rm_so > -1 && subs[walk[1] - '0'].rm_eo > -1) { new_l += subs[walk[1] - '0'].rm_eo Index: php4/main/fopen_wrappers.c diff -u php4/main/fopen_wrappers.c:1.142.2.2 php4/main/fopen_wrappers.c:1.142.2.3 --- php4/main/fopen_wrappers.c:1.142.2.2 Sat May 11 16:02:21 2002 +++ php4/main/fopen_wrappers.c Fri Aug 23 04:00:49 2002 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.142.2.2 2002/05/11 20:02:21 rasmus Exp $ */ +/* $Id: fopen_wrappers.c,v 1.142.2.3 2002/08/23 08:00:49 zeev Exp $ */ /* {{{ includes */ @@ -137,7 +137,7 @@ When open_basedir is NULL, always return 0 */ -PHPAPI int php_check_specific_open_basedir(char *basedir, char *path TSRMLS_DC) +PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path TSRMLS_DC) { char resolved_name[MAXPATHLEN]; char resolved_basedir[MAXPATHLEN]; @@ -184,7 +184,7 @@ /* {{{ php_check_open_basedir */ -PHPAPI int php_check_open_basedir(char *path TSRMLS_DC) +PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC) { /* Only check when open_basedir is available */ if (PG(open_basedir) && *PG(open_basedir)) { Index: php4/main/fopen_wrappers.h diff -u php4/main/fopen_wrappers.h:1.33 php4/main/fopen_wrappers.h:1.33.2.1 --- php4/main/fopen_wrappers.h:1.33 Thu Feb 28 03:27:03 2002 +++ php4/main/fopen_wrappers.h Fri Aug 23 04:00:49 2002 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.h,v 1.33 2002/02/28 08:27:03 sebastian Exp $ */ +/* $Id: fopen_wrappers.h,v 1.33.2.1 2002/08/23 08:00:49 zeev Exp $ */ #ifndef FOPEN_WRAPPERS_H #define FOPEN_WRAPPERS_H @@ -71,8 +71,8 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC); PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC); -PHPAPI int php_check_open_basedir(char *path TSRMLS_DC); -PHPAPI int php_check_specific_open_basedir(char *basedir, char *path TSRMLS_DC); +PHPAPI int php_check_open_basedir(const char *path 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);