cvs: /php4/ext/standard dl.c /php4/ext/zlib php_zlib.h zlib.c /php4/win32 winutil.c winutil.h

zeev Fri Dec 17 17:34:35 1999 EDT Modified files: /php4/ext/standard dl.c /php4/ext/zlib php_zlib.h zlib.c /php4/win32 winutil.c winutil.h Log: More php3_ cleanup Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.17 php4/ext/standard/dl.c:1.18 --- php4/ext/standard/dl.c:1.17 Fri Dec 17 15:55:24 1999 +++ php4/ext/standard/dl.c Fri Dec 17 17:34:01 1999 @@ -113,7 +113,7 @@ error_type = E_CORE_ERROR; } #if MSVC5 - php_error(error_type,"Unable to load dynamic library '%s'<br>\n%s",libpath,php3_win_err()); + php_error(error_type,"Unable to load dynamic library '%s'<br>\n%s",libpath,php_win_err()); #else php_error(error_type,"Unable to load dynamic library '%s' - %s",libpath,dlerror()); #endif Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.2 php4/ext/zlib/php_zlib.h:1.3 --- php4/ext/zlib/php_zlib.h:1.2 Fri Dec 17 15:55:31 1999 +++ php4/ext/zlib/php_zlib.h Fri Dec 17 17:34:03 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zlib.h,v 1.2 1999/12/17 20:55:31 zeev Exp $ */ +/* $Id: php_zlib.h,v 1.3 1999/12/17 22:34:03 zeev Exp $ */ #ifndef _PHP_ZLIB_H #define _PHP_ZLIB_H @@ -39,8 +39,8 @@ int gzgetss_state; } php_zlib_globals; -extern zend_module_entry php3_zlib_module_entry; -#define zlib_module_ptr &php3_zlib_module_entry +extern zend_module_entry php_zlib_module_entry; +#define zlib_module_ptr &php_zlib_module_entry extern PHP_MINIT_FUNCTION(zlib); extern PHP_MSHUTDOWN_FUNCTION(zlib); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.27 php4/ext/zlib/zlib.c:1.28 --- php4/ext/zlib/zlib.c:1.27 Fri Dec 17 15:55:31 1999 +++ php4/ext/zlib/zlib.c Fri Dec 17 17:34:03 1999 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.27 1999/12/17 20:55:31 zeev Exp $ */ +/* $Id: zlib.c,v 1.28 1999/12/17 22:34:03 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -79,7 +79,7 @@ /* True globals, no need for thread safety */ static int le_zp; -function_entry php3_zlib_functions[] = { +function_entry php_zlib_functions[] = { PHP_FE(readgzfile, NULL) PHP_FE(gzrewind, NULL) PHP_FE(gzclose, NULL) @@ -98,9 +98,9 @@ {NULL, NULL, NULL} }; -zend_module_entry php3_zlib_module_entry = { +zend_module_entry php_zlib_module_entry = { "zlib", - php3_zlib_functions, + php_zlib_functions, PHP_MINIT(zlib), PHP_MSHUTDOWN(zlib), NULL, @@ -149,14 +149,14 @@ PUTS(")."); } -static gzFile *php3_gzopen_with_path(char *filename, char *mode, char *path, char **opened_path); +static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char **opened_path); -static gzFile php3_gzopen_wrapper(char *path, char *mode, int options) +static gzFile php_gzopen_wrapper(char *path, char *mode, int options) { PLS_FETCH(); if (options & USE_PATH && PG(include_path) != NULL) { - return php3_gzopen_with_path(path, mode, PG(include_path), NULL); + return php_gzopen_with_path(path, mode, PG(include_path), NULL); } else { if (options & ENFORCE_SAFE_MODE && PG(safe_mode) && (!php_checkuid(path,1))) { @@ -171,7 +171,7 @@ * Tries to open a .gz-file with a PATH-style list of directories. * If the filename starts with "." or "/", the path is ignored. */ -static gzFile *php3_gzopen_with_path(char *filename, char *mode, char *path, char **opened_path) +static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char **opened_path) { char *pathbuf, *ptr, *end; char trypath[MAXPATHLEN + 1]; @@ -303,7 +303,7 @@ } convert_to_string_ex(filename); - zp = php3_gzopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE); + zp = php_gzopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE); if (!zp) { php_error(E_WARNING,"gzFile(\"%s\") - %s",(*filename)->value.str.val,strerror(errno)); RETURN_FALSE; @@ -361,9 +361,9 @@ /* * We need a better way of returning error messages from - * php3_gzopen_wrapper(). + * php_gzopen_wrapper(). */ - zp = php3_gzopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE); + zp = php_gzopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE); if (!zp) { php_error(E_WARNING,"gzopen(\"%s\",\"%s\") - %s", (*arg1)->value.str.val, p, strerror(errno)); @@ -659,9 +659,9 @@ /* * We need a better way of returning error messages from - * php3_gzopen_wrapper(). + * php_gzopen_wrapper(). */ - zp = php3_gzopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE); + zp = php_gzopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE); if (!zp){ php_error(E_WARNING,"ReadGzFile(\"%s\") - %s",(*arg1)->value.str.val,strerror(errno)); RETURN_FALSE; Index: php4/win32/winutil.c diff -u php4/win32/winutil.c:1.2 php4/win32/winutil.c:1.3 --- php4/win32/winutil.c:1.2 Fri Apr 23 16:06:01 1999 +++ php4/win32/winutil.c Fri Dec 17 17:34:04 1999 @@ -6,7 +6,7 @@ static char Win_Error_msg[256]; #endif -char *php3_win_err(void) +char *php_win_err(void) { FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, Index: php4/win32/winutil.h diff -u php4/win32/winutil.h:1.1 php4/win32/winutil.h:1.2 --- php4/win32/winutil.h:1.1 Wed Apr 7 17:05:12 1999 +++ php4/win32/winutil.h Fri Dec 17 17:34:04 1999 @@ -1 +1 @@ -extern char *php3_win_err(void); +extern char *php_win_err(void);