Fix a few warnings (MFH)

php · Aug 23, 2002 · 273a2bf · 273a2bf
1 parent 48880dc
commit 273a2bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
@@ -341,7 +341,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
 			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

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
@@ -341,7 +341,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
 			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

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
@@ -137,7 +137,7 @@ int php_shutdown_fopen_wrappers(TSRMLS_D)
 	
 	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 @@ PHPAPI int php_check_specific_open_basedir(char *basedir, char *path TSRMLS_DC)
 
 /* {{{ 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)) {

diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
@@ -71,8 +71,8 @@ PHPAPI FILE *php_fopen_wrapper(char *filename, char *mode, int options, int *iss
 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);