cvs: /php4 configuration-parser.y main.c /php4/dl phpdl.h /php4/dl/calendar calendar.c /php4/dl/crypt crypt.c /php4/dl/log log.c log.h log_db.c
/php4/dl/mssql mssql.c php_mssql.h /php4/dl/snmp php_snmp.h snmp.c winsnmp.c /php4/dl/vmailmgr php3_vmailmgr.c /php4/ext/apache apache.c
/php4/ext/aspell aspell.c php_aspell.h /php4/ext/bcmath bcmath.c php_bcmath.h /php4/ext/cpdf cpdf.c php_cpdf.h /php4/ext/dav dav.c php_dav.h
/php4/ext/db db.c php_db.h /php4/ext/dba dba.c php_dba.h /php4/ext/dbase dbase.c php_dbase.h /php4/ext/domxml domxml.c php_domxml.h /php4/ext/fdf
fdf.c php_fdf.h /php4/ext/filepro filepro.c php_filepro.h /php4/ext/ftp php_ftp.c php_ftp.h /php4/ext/gd gd.c gdt1.c php_gd.h /php4/ext/gettext
gettext.c php_gettext.h /php4/ext/hyperwave hg_comm.c hw.c php_hyperwave.h /php4/ext/icap php3_icap.c php_icap.h /php4/ext/imap imap.c
/php4/ext/informix php_informix.h /php4/ext/interbase interbase.c php_interbase.h /php4/ext/java java.c /php4/ext/ldap ldap.c php_ldap.h
/php4/ext/mcal php3_mcal.c php_mcal.h /php4/ext/mcrypt php_mcrypt.h /php4/ext/mhash php_mhash.h /php4/ext/oci8 oci8.c php_oci8.h /php4/ext/odbc
php_odbc.c php_odbc.h php_velocis.h velocis.c /php4/ext/oracle oracle.c php_oracle.h /php4/ext/pdf pdf.c php_pdf.h /php4/ext/pgsql pgsql.c php_pgsql.h
/php4/ext/posix php_posix.h posix.c /php4/ext/snmp php_snmp.h snmp.c /php4/ext/standard base64.c base64.h basic_functions.c basic_functions.h
browscap.c crypt.c dir.c dl.c dl.h file.c filestat.c formatted_print.c fsock.c fsock.h head.c head.h mail.c output.c pack.c pack.h php_browscap.h
php_crypt.h php_dir.h php_filestat.h php_mail.h php_syslog.h reg.h syslog.c /php4/ext/sybase php_sybase.h sybase.c /php4/ext/sysvsem php_sysvsem.h
sysvsem.c /php4/ext/sysvshm php_sysvshm.h sysvshm.c /php4/ext/xml php_xml.h xml.c /php4/ext/yp php_yp.h /php4/ext/zlib php_zlib.h zlib.c

zeev Fri Dec 17 15:55:37 1999 EDT Modified files: /php4 configuration-parser.y main.c /php4/dl phpdl.h /php4/dl/calendar calendar.c /php4/dl/crypt crypt.c /php4/dl/log log.c log.h log_db.c /php4/dl/mssql mssql.c php_mssql.h /php4/dl/snmp php_snmp.h snmp.c winsnmp.c /php4/dl/vmailmgr php3_vmailmgr.c /php4/ext/apache apache.c /php4/ext/aspell aspell.c php_aspell.h /php4/ext/bcmath bcmath.c php_bcmath.h /php4/ext/cpdf cpdf.c php_cpdf.h /php4/ext/dav dav.c php_dav.h /php4/ext/db db.c php_db.h /php4/ext/dba dba.c php_dba.h /php4/ext/dbase dbase.c php_dbase.h /php4/ext/domxml domxml.c php_domxml.h /php4/ext/fdf fdf.c php_fdf.h /php4/ext/filepro filepro.c php_filepro.h /php4/ext/ftp php_ftp.c php_ftp.h /php4/ext/gd gd.c gdt1.c php_gd.h /php4/ext/gettext gettext.c php_gettext.h /php4/ext/hyperwave hg_comm.c hw.c php_hyperwave.h /php4/ext/icap php3_icap.c php_icap.h /php4/ext/imap imap.c /php4/ext/informix php_informix.h /php4/ext/interbase interbase.c php_interbase.h /php4/ext/java java.c /php4/ext/ldap ldap.c php_ldap.h /php4/ext/mcal php3_mcal.c php_mcal.h /php4/ext/mcrypt php_mcrypt.h /php4/ext/mhash php_mhash.h /php4/ext/oci8 oci8.c php_oci8.h /php4/ext/odbc php_odbc.c php_odbc.h php_velocis.h velocis.c /php4/ext/oracle oracle.c php_oracle.h /php4/ext/pdf pdf.c php_pdf.h /php4/ext/pgsql pgsql.c php_pgsql.h /php4/ext/posix php_posix.h posix.c /php4/ext/snmp php_snmp.h snmp.c /php4/ext/standard base64.c base64.h basic_functions.c basic_functions.h browscap.c crypt.c dir.c dl.c dl.h file.c filestat.c formatted_print.c fsock.c fsock.h head.c head.h mail.c output.c pack.c pack.h php_browscap.h php_crypt.h php_dir.h php_filestat.h php_mail.h php_syslog.h reg.h syslog.c /php4/ext/sybase php_sybase.h sybase.c /php4/ext/sysvsem php_sysvsem.h sysvsem.c /php4/ext/sysvshm php_sysvshm.h sysvshm.c /php4/ext/xml php_xml.h xml.c /php4/ext/yp php_yp.h /php4/ext/zlib php_zlib.h zlib.c Log: - Made PHP_VERSION and PHP_OS work again - More php3_ cleanup @- Restored the PHP_VERSION and PHP_OS constants (Zeev) Index: php4/configuration-parser.y diff -u php4/configuration-parser.y:1.24 php4/configuration-parser.y:1.25 --- php4/configuration-parser.y:1.24 Fri Dec 17 14:50:56 1999 +++ php4/configuration-parser.y Fri Dec 17 15:54:32 1999 @@ -19,7 +19,7 @@ -/* $Id: configuration-parser.y,v 1.24 1999/12/17 19:50:56 zeev Exp $ */ +/* $Id: configuration-parser.y,v 1.25 1999/12/17 20:54:32 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" @@ -50,7 +50,7 @@ extern HashTable browser_hash; PHPAPI extern char *php_ini_path; #endif -static HashTable *active_zend_hash_table; +static HashTable *activezend_hash_table; static pval *current_section; static char *currently_parsed_filename; @@ -230,7 +230,7 @@ } init_cfg_scanner(); - active_zend_hash_table = &configuration_hash; + activezend_hash_table = &configuration_hash; parsing_mode = PARSING_MODE_CFG; currently_parsed_filename = "php.ini"; yyparse(); @@ -258,7 +258,7 @@ return FAILURE; } init_cfg_scanner(); - active_zend_hash_table = &browser_hash; + activezend_hash_table = &browser_hash; parsing_mode = PARSING_MODE_BROWSCAP; currently_parsed_filename = browscap; yyparse(); @@ -355,8 +355,8 @@ #endif $3.type = IS_STRING; if (parsing_mode==PARSING_MODE_CFG) { - zend_hash_update(active_zend_hash_table, $1.value.str.val, $1.value.str.len+1, &$3, sizeof(pval), NULL); - if (active_zend_hash_table == &configuration_hash) { + zend_hash_update(activezend_hash_table, $1.value.str.val, $1.value.str.len+1, &$3, sizeof(pval), NULL); + if (activezend_hash_table == &configuration_hash) { php_alter_ini_entry($1.value.str.val, $1.value.str.len+1, $3.value.str.val, $3.value.str.len+1, PHP_INI_SYSTEM); } } else if (parsing_mode==PARSING_MODE_BROWSCAP) { @@ -406,7 +406,7 @@ tmp.value.ht = (HashTable *) malloc(sizeof(HashTable)); zend_hash_init(tmp.value.ht, 0, NULL, (int (*)(void *))pvalue_config_destructor, 1); tmp.type = IS_OBJECT; - zend_hash_update(active_zend_hash_table, $1.value.str.val, $1.value.str.len+1, (void *) &tmp, sizeof(pval), (void **) &current_section); + zend_hash_update(activezend_hash_table, $1.value.str.val, $1.value.str.len+1, (void *) &tmp, sizeof(pval), (void **) &current_section); tmp.value.str.val = zend_strndup($1.value.str.val,$1.value.str.len); tmp.value.str.len = $1.value.str.len; tmp.type = IS_STRING; Index: php4/main.c diff -u php4/main.c:1.160 php4/main.c:1.161 --- php4/main.c:1.160 Fri Dec 17 14:50:56 1999 +++ php4/main.c Fri Dec 17 15:54:32 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.160 1999/12/17 19:50:56 zeev Exp $ */ +/* $Id: main.c,v 1.161 1999/12/17 20:54:32 zeev Exp $ */ #include <stdio.h> @@ -887,6 +887,7 @@ zend_utility_functions zuf; zend_utility_values zuv; int module_number=0; /* for REGISTER_INI_ENTRIES() */ + char *php_os; #ifdef ZTS zend_executor_globals *executor_globals; php_core_globals *core_globals; @@ -896,6 +897,16 @@ WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; #endif +#if WIN32|WINNT + /* Get build numbers for Windows NT or Win95 */ + if (dwVersion < 0x80000000){ + php_os="WINNT"; + } else { + php_os="WIN32"; + } +#else + php_os=PHP_OS; +#endif global_lock_init(); SG(server_context) = NULL; @@ -962,6 +973,9 @@ zuv.import_use_extension = ".php"; zend_set_utility_values(&zuv); php_startup_SAPI_content_types(); + + REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); if (php_startup_internal_extensions() == FAILURE) { php_printf("Unable to start builtin modules\n"); Index: php4/dl/phpdl.h diff -u php4/dl/phpdl.h:1.2 php4/dl/phpdl.h:1.3 --- php4/dl/phpdl.h:1.2 Wed Dec 1 17:59:43 1999 +++ php4/dl/phpdl.h Fri Dec 17 15:54:35 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: phpdl.h,v 1.2 1999/12/01 22:59:43 ssb Exp $ */ +/* $Id: phpdl.h,v 1.3 1999/12/17 20:54:35 zeev Exp $ */ #ifndef _PHPDL_H #define _PHPDL_H @@ -39,7 +39,7 @@ #define DLEXPORT #endif -DLEXPORT php3_module_entry *get_module(void); +DLEXPORT zend_module_entry *get_module(void); #endif Index: php4/dl/calendar/calendar.c diff -u php4/dl/calendar/calendar.c:1.2 php4/dl/calendar/calendar.c:1.3 --- php4/dl/calendar/calendar.c:1.2 Thu Dec 16 23:20:40 1999 +++ php4/dl/calendar/calendar.c Fri Dec 17 15:54:36 1999 @@ -36,7 +36,7 @@ #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &calendar_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &calendar_module_entry; } #endif DLEXPORT void cal_jdtogreg(INTERNAL_FUNCTION_PARAMETERS) Index: php4/dl/crypt/crypt.c diff -u php4/dl/crypt/crypt.c:1.2 php4/dl/crypt/crypt.c:1.3 --- php4/dl/crypt/crypt.c:1.2 Mon Aug 2 15:16:37 1999 +++ php4/dl/crypt/crypt.c Fri Dec 17 15:54:37 1999 @@ -151,7 +151,7 @@ extern int _getpid(void); #endif -void php3_crypt(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(crypt) { char salt[4]; int arg_count = ARG_COUNT(ht); @@ -190,16 +190,16 @@ {"encrypt", sflcrypt_encrypt, NULL}, {"decrypt", sflcrypt_decrypt, NULL}, #ifdef HAVE_CRYPT_H - {"crypt", php3_crypt, NULL}, + PHP_FE(crypt, NULL) #endif {NULL,NULL,NULL} }; -php3_module_entry sflcrypt_module_entry = { +zend_module_entry sflcrypt_module_entry = { "sflCrypt", sflcrypt_functions, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &sflcrypt_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &sflcrypt_module_entry; } #endif Index: php4/dl/log/log.c diff -u php4/dl/log/log.c:1.1 php4/dl/log/log.c:1.2 --- php4/dl/log/log.c:1.1 Wed Apr 7 17:03:06 1999 +++ php4/dl/log/log.c Fri Dec 17 15:54:37 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: log.c,v 1.1 1999/04/07 21:03:06 zeev Exp $ */ +/* $Id: log.c,v 1.2 1999/12/17 20:54:37 zeev Exp $ */ #include "phpdl.h" #include "log.h" @@ -153,7 +153,7 @@ _php3_log_msql(); #endif #if LOG_DBM - _php3_log_db(); + php_log_db(); #endif } @@ -177,19 +177,19 @@ RETURN_STRING(as->value.str.val); } -DLEXPORT void _php3_load_log_info(void) { +DLEXPORT void php_load_log_info(void) { /* construct the logfile name if it wasn't set by logas() or because we already read the log once) */ if (!log_stats.logfile) _php3_log_setfilename(); #if LOG_DBM - _php3_load_log_info_db(); + php_load_log_info_db(); #endif } #define LOAD_LAST_LOG_INFO \ if (!log_stats.filled) \ - _php3_load_log_info(); + php_load_log_info(); DLEXPORT void php3_getlasthost(INTERNAL_FUNCTION_PARAMETERS) { LOAD_LAST_LOG_INFO; Index: php4/dl/log/log.h diff -u php4/dl/log/log.h:1.1 php4/dl/log/log.h:1.2 --- php4/dl/log/log.h:1.1 Wed Apr 7 17:03:06 1999 +++ php4/dl/log/log.h Fri Dec 17 15:54:38 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: log.h,v 1.1 1999/04/07 21:03:06 zeev Exp $ */ +/* $Id: log.h,v 1.2 1999/12/17 20:54:38 zeev Exp $ */ #ifndef _PHP_LOG_H #define _PHP_LOG_H @@ -71,10 +71,10 @@ extern void _php3_log(void); extern char *_php3_filename_to_logfn(char *filename); -extern void _php3_load_log_info(void); +extern void php_load_log_info(void); -extern void _php3_log_db(void); -extern void _php3_load_log_info_db(void); +extern void php_log_db(void); +extern void php_load_log_info_db(void); /* logging functions */ extern int php3_init_log(INIT_FUNC_ARGS); Index: php4/dl/log/log_db.c diff -u php4/dl/log/log_db.c:1.3 php4/dl/log/log_db.c:1.4 --- php4/dl/log/log_db.c:1.3 Fri Dec 17 14:51:00 1999 +++ php4/dl/log/log_db.c Fri Dec 17 15:54:38 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: log_db.c,v 1.3 1999/12/17 19:51:00 zeev Exp $ */ +/* $Id: log_db.c,v 1.4 1999/12/17 20:54:38 zeev Exp $ */ #include "phpdl.h" #include "log.h" @@ -47,7 +47,7 @@ #include "functions/db.h" #include "log.h" -void _php3_log_db() { +void php_log_db() { #if LOGGING char path[1024]; @@ -72,7 +72,7 @@ /* verify that the logging directory exists */ if (!log_stats.filled) - _php3_load_log_info(); + php_load_log_info(); /* SAFE_MODE concern: should make sure that the user is logging somewhere safe */ @@ -98,11 +98,11 @@ es = EG(error_reporting); EG(error_reporting) = 0; - dbm = _php3_dbmopen(path, "w"); + dbm = php_dbm_open(path, "w"); EG(error_reporting) = es; if (!dbm) { - dbm = _php3_dbmopen(path, "n"); + dbm = php_dbm_open(path, "n"); if (!dbm) { php_error(E_WARNING, "Unable to create %s", path); return; @@ -114,7 +114,7 @@ sprintf(key,"%ld",(long)t); /* retry a few times for some reason */ - while(!_php3_dbminsert(dbm, "first", key)) { + while(!php_dbm_insert(dbm, "first", key)) { retries++; if (retries > 20) { retries = 0; @@ -127,7 +127,7 @@ #if NOLOGSUCCESSIVE lasthost = getlasthost(); if (strncmp(host, lasthost, 128)==0) { - _php3_dbmclose(dbm); + php_dbm_close(dbm); return; } #endif @@ -146,7 +146,7 @@ sprintf(key,"%ld",(long)t); ret=1; while(ret) { - ret = _php3_dbminsert(dbm, key, buf); + ret = php_dbm_insert(dbm, key, buf); if (ret) { sprintf(key,"%ld%c",(long)t,' '+try++); } @@ -167,12 +167,12 @@ lref ? lref : "", 27, browser ? browser : ""); - _php3_dbmreplace(dbm, "last", buf); - _php3_dbmclose(dbm); + php_dbm_replace(dbm, "last", buf); + php_dbm_close(dbm); #endif } -void _php3_load_log_info_db() { +void php_load_log_info_db() { #if LOGGING dbm_info *dbm; char *value; @@ -191,7 +191,7 @@ es = EG(error_reporting); EG(error_reporting) = 0; - dbm = _php3_dbmopen(path, "r"); + dbm = php_dbm_open(path, "r"); EG(error_reporting) = es; if (!dbm) { @@ -207,7 +207,7 @@ return; } - value = s = _php3_dbmfetch(dbm, "last"); + value = s = php_dbm_fetch(dbm, "last"); ss = (char *)strchr(s,' '); @@ -259,7 +259,7 @@ } if (value) efree(value); - value = s = _php3_dbmfetch(dbm, "first"); + value = s = php_dbm_fetch(dbm, "first"); if (!s) { /* If there is no first entry in the dbm file, add one now. This obviously won't be the correct first entry date, but @@ -268,7 +268,7 @@ sprintf(key,"%ld",(long)t); ret = 1; while (ret) { - ret = _php3_dbminsert(dbm,"first",key); + ret = php_dbm_insert(dbm,"first",key); retries++; if (retries>20) { retries = 0; @@ -282,7 +282,7 @@ if (value) efree(value); log_stats.filled = 1; - _php3_dbmclose(dbm); + php_dbm_close(dbm); #endif } Index: php4/dl/mssql/mssql.c diff -u php4/dl/mssql/mssql.c:1.9 php4/dl/mssql/mssql.c:1.10 --- php4/dl/mssql/mssql.c:1.9 Fri Dec 17 14:51:01 1999 +++ php4/dl/mssql/mssql.c Fri Dec 17 15:54:39 1999 @@ -75,12 +75,12 @@ {NULL, NULL, NULL} }; -php3_module_entry mssql_module_entry = { +zend_module_entry mssql_module_entry = { "Microsoft SQL", mssql_functions, php3_minit_mssql, php3_mshutdown_mssql, php3_rinit_mssql, php3_rshutdown_mssql, php3_info_mssql, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &mssql_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &mssql_module_entry; } #endif Index: php4/dl/mssql/php_mssql.h diff -u php4/dl/mssql/php_mssql.h:1.1 php4/dl/mssql/php_mssql.h:1.2 --- php4/dl/mssql/php_mssql.h:1.1 Sat Dec 4 14:15:42 1999 +++ php4/dl/mssql/php_mssql.h Fri Dec 17 15:54:40 1999 @@ -28,7 +28,7 @@ */ -/* $Id: php_mssql.h,v 1.1 1999/12/04 19:15:42 sas Exp $ */ +/* $Id: php_mssql.h,v 1.2 1999/12/17 20:54:40 zeev Exp $ */ #ifndef _PHP_MSSQL_H #define _PHP_MSSQL_H @@ -40,7 +40,7 @@ #if HAVE_MSSQL -extern php3_module_entry mssql_module_entry; +extern zend_module_entry mssql_module_entry; #define mssql_module_ptr &mssql_module_entry #include "phpdl.h" Index: php4/dl/snmp/php_snmp.h diff -u php4/dl/snmp/php_snmp.h:1.1 php4/dl/snmp/php_snmp.h:1.2 --- php4/dl/snmp/php_snmp.h:1.1 Sat Dec 4 14:15:42 1999 +++ php4/dl/snmp/php_snmp.h Fri Dec 17 15:54:41 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: php_snmp.h,v 1.1 1999/12/04 19:15:42 sas Exp $ */ +/* $Id: php_snmp.h,v 1.2 1999/12/17 20:54:41 zeev Exp $ */ #ifndef _PHP_SNMP_H #define _PHP_SNMP_H @@ -40,7 +40,7 @@ #if HAVE_SNMP -extern php3_module_entry snmp_module_entry; +extern zend_module_entry snmp_module_entry; #define snmp_module_ptr &snmp_module_entry extern DLEXPORT void php3_snmpget(INTERNAL_FUNCTION_PARAMETERS); Index: php4/dl/snmp/snmp.c diff -u php4/dl/snmp/snmp.c:1.3 php4/dl/snmp/snmp.c:1.4 --- php4/dl/snmp/snmp.c:1.3 Sat Dec 4 14:15:42 1999 +++ php4/dl/snmp/snmp.c Fri Dec 17 15:54:41 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.3 1999/12/04 19:15:42 sas Exp $ */ +/* $Id: snmp.c,v 1.4 1999/12/17 20:54:41 zeev Exp $ */ #ifndef __P #define __P(p) p @@ -76,12 +76,12 @@ {NULL,NULL,NULL} }; -php3_module_entry snmp_module_entry = { +zend_module_entry snmp_module_entry = { "SNMP",snmp_functions,NULL,NULL,NULL,NULL,NULL,0,0,0,NULL }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &snmp_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; }; #endif /* THREAD_LS snmp_module php3_snmp_module; - may need one of these at some point */ Index: php4/dl/snmp/winsnmp.c diff -u php4/dl/snmp/winsnmp.c:1.3 php4/dl/snmp/winsnmp.c:1.4 --- php4/dl/snmp/winsnmp.c:1.3 Sat Dec 4 14:15:42 1999 +++ php4/dl/snmp/winsnmp.c Fri Dec 17 15:54:41 1999 @@ -28,12 +28,12 @@ {NULL,NULL,NULL} }; -php3_module_entry snmp_module_entry = { +zend_module_entry snmp_module_entry = { "SNMP",snmp_functions,NULL,NULL,NULL,NULL,NULL,0,0,0,NULL }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &snmp_module_entry; } +DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; } #endif #define GET 1 Index: php4/dl/vmailmgr/php3_vmailmgr.c diff -u php4/dl/vmailmgr/php3_vmailmgr.c:1.1 php4/dl/vmailmgr/php3_vmailmgr.c:1.2 --- php4/dl/vmailmgr/php3_vmailmgr.c:1.1 Wed Apr 7 17:03:15 1999 +++ php4/dl/vmailmgr/php3_vmailmgr.c Fri Dec 17 15:54:42 1999 @@ -132,8 +132,8 @@ }; -php3_module_entry vmailmgr_module_entry = { +zend_module_entry vmailmgr_module_entry = { "QmailVMailMgr", vmailmgr_functions, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL }; -php3_module_entry *get_module(void) { return &vmailmgr_module_entry; } +zend_module_entry *get_module(void) { return &vmailmgr_module_entry; } Index: php4/ext/apache/apache.c diff -u php4/ext/apache/apache.c:1.22 php4/ext/apache/apache.c:1.23 --- php4/ext/apache/apache.c:1.22 Tue Nov 23 01:46:40 1999 +++ php4/ext/apache/apache.c Fri Dec 17 15:54:43 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache.c,v 1.22 1999/11/23 06:46:40 evan Exp $ */ +/* $Id: apache.c,v 1.23 1999/12/17 20:54:43 zeev Exp $ */ #include "php.h" #include "ext/standard/head.h" #include "php_globals.h" @@ -113,7 +113,7 @@ } -php3_module_entry apache_module_entry = { +zend_module_entry apache_module_entry = { "Apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES }; Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.8 php4/ext/aspell/aspell.c:1.9 --- php4/ext/aspell/aspell.c:1.8 Fri Dec 17 14:51:02 1999 +++ php4/ext/aspell/aspell.c Fri Dec 17 15:54:44 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.8 1999/12/17 19:51:02 zeev Exp $ */ +/* $Id: aspell.c,v 1.9 1999/12/17 20:54:44 zeev Exp $ */ #include "php.h" #if defined(COMPILE_DL) @@ -46,13 +46,13 @@ static int le_aspell; -php3_module_entry aspell_module_entry = { +zend_module_entry aspell_module_entry = { "Aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &aspell_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &aspell_module_entry; } #endif PHP_MINIT_FUNCTION(aspell) Index: php4/ext/aspell/php_aspell.h diff -u php4/ext/aspell/php_aspell.h:1.1 php4/ext/aspell/php_aspell.h:1.2 --- php4/ext/aspell/php_aspell.h:1.1 Sat Dec 4 14:19:52 1999 +++ php4/ext/aspell/php_aspell.h Fri Dec 17 15:54:45 1999 @@ -28,12 +28,12 @@ */ -/* $Id: php_aspell.h,v 1.1 1999/12/04 19:19:52 sas Exp $ */ +/* $Id: php_aspell.h,v 1.2 1999/12/17 20:54:45 zeev Exp $ */ #ifndef _ASPELL_H #define _ASPELL_H #if HAVE_ASPELL -extern php3_module_entry aspell_module_entry; +extern zend_module_entry aspell_module_entry; #define aspell_module_ptr &aspell_module_entry extern PHP_MINIT_FUNCTION(aspell); Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.10 php4/ext/bcmath/bcmath.c:1.11 --- php4/ext/bcmath/bcmath.c:1.10 Tue Dec 14 16:44:35 1999 +++ php4/ext/bcmath/bcmath.c Fri Dec 17 15:54:46 1999 @@ -36,12 +36,12 @@ {NULL, NULL, NULL} }; -php3_module_entry bcmath_module_entry = { +zend_module_entry bcmath_module_entry = { "bcmath", bcmath_functions, NULL, NULL, PHP_RINIT(bcmath), PHP_RSHUTDOWN(bcmath), NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -php3_module_entry *get_module() { return &bcmath_module_entry; }; +zend_module_entry *get_module() { return &bcmath_module_entry; }; #endif #ifndef THREAD_SAFE Index: php4/ext/bcmath/php_bcmath.h diff -u php4/ext/bcmath/php_bcmath.h:1.1 php4/ext/bcmath/php_bcmath.h:1.2 --- php4/ext/bcmath/php_bcmath.h:1.1 Sat Dec 4 14:19:53 1999 +++ php4/ext/bcmath/php_bcmath.h Fri Dec 17 15:54:46 1999 @@ -28,7 +28,7 @@ */ -/* $Id: php_bcmath.h,v 1.1 1999/12/04 19:19:53 sas Exp $ */ +/* $Id: php_bcmath.h,v 1.2 1999/12/17 20:54:46 zeev Exp $ */ #ifndef _PHP_BCMATH_H #define _PHP_BCMATH_H @@ -40,7 +40,7 @@ #if WITH_BCMATH -extern php3_module_entry bcmath_module_entry; +extern zend_module_entry bcmath_module_entry; #define phpext_bcmath_ptr &bcmath_module_entry extern PHP_RINIT_FUNCTION(bcmath); Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.5 php4/ext/cpdf/cpdf.c:1.6 --- php4/ext/cpdf/cpdf.c:1.5 Fri Dec 17 14:51:05 1999 +++ php4/ext/cpdf/cpdf.c Fri Dec 17 15:54:47 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.5 1999/12/17 19:51:05 zeev Exp $ */ +/* $Id: cpdf.c,v 1.6 1999/12/17 20:54:47 zeev Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -150,13 +150,13 @@ {NULL, NULL, NULL} }; -php3_module_entry cpdf_module_entry = { +zend_module_entry cpdf_module_entry = { "cpdf", cpdf_functions, PHP_MINIT(cpdf), PHP_MSHUTDOWN(cpdf), PHP_RINIT(cpdf), NULL, PHP_MINFO(cpdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &cpdf_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &cpdf_module_entry; } #endif static void _free_outline(CPDFoutlineEntry *outline) @@ -183,7 +183,7 @@ PHP_MINFO_FUNCTION(cpdf) { /* need to use a PHPAPI function here because it is external module in windows */ - php3_printf("Version %s", cpdf_version()); + php_printf("Version %s", cpdf_version()); } PHP_MSHUTDOWN_FUNCTION(cpdf){ @@ -208,7 +208,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -236,7 +236,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -264,7 +264,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -292,7 +292,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -323,7 +323,7 @@ pagemode=argv[1]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -377,7 +377,7 @@ convert_to_string(arg2); #if APACHE if(strcmp(arg2->value.str.val, "-") == 0) - php3_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead."); + php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead."); #endif cpdf_setOutputFilename(cpdf, arg2->value.str.val); } @@ -404,7 +404,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } zend_list_delete(id); @@ -442,7 +442,7 @@ width = argv[4]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -477,7 +477,7 @@ pagenr=arg2->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -505,7 +505,7 @@ pagenr=arg2->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -531,7 +531,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -557,7 +557,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -584,7 +584,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -615,7 +615,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -649,7 +649,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -676,7 +676,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -768,12 +768,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if(arg4->value.lval > 6) { - php3_error(E_WARNING,"Font encoding set to 5"); + php_error(E_WARNING,"Font encoding set to 5"); arg4->value.lval = 5; } cpdf_setFont(pdf, arg2->value.str.val, arg4->value.str.val, (float) arg3->value.dval); @@ -799,7 +799,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -826,7 +826,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -853,7 +853,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -880,7 +880,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -911,19 +911,19 @@ matrix=arg2->value.ht; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } - if(_php3_hash_num_elements(matrix) != 6) { - php3_error(E_WARNING,"Text matrix must have 6 elements"); + if(zend_hash_num_elements(matrix) != 6) { + php_error(E_WARNING,"Text matrix must have 6 elements"); RETURN_FALSE; } pdfmatrixptr = pdfmatrix; - _php3_hash_internal_pointer_reset(matrix); - for(i=0; i<_php3_hash_num_elements(matrix); i++) { - _php3_hash_get_current_data(matrix, (void *) &data); + zend_hash_internal_pointer_reset(matrix); + for(i=0; i<zend_hash_num_elements(matrix); i++) { + zend_hash_get_current_data(matrix, (void *) &data); switch(data->type) { case IS_DOUBLE: *pdfmatrixptr++ = (float) data->value.dval; @@ -932,7 +932,7 @@ *pdfmatrixptr++ = 0.0; break; } - _php3_hash_move_forward(matrix); + zend_hash_move_forward(matrix); } cpdf_setTextMatrix(pdf, pdfmatrix[0], pdfmatrix[1], @@ -963,7 +963,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -997,7 +997,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1024,7 +1024,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1051,7 +1051,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1079,7 +1079,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1105,7 +1105,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1131,7 +1131,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1159,7 +1159,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1187,7 +1187,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1214,7 +1214,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1242,12 +1242,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 100) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); + php_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); RETURN_FALSE; } @@ -1274,12 +1274,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); + php_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); RETURN_FALSE; } @@ -1306,12 +1306,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); + php_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); RETURN_FALSE; } @@ -1338,12 +1338,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if(arg2->value.dval < 1) { - php3_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); + php_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); RETURN_FALSE; } @@ -1370,7 +1370,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1400,7 +1400,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1432,7 +1432,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1469,7 +1469,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1510,7 +1510,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1557,7 +1557,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1594,7 +1594,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1632,7 +1632,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1672,7 +1672,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1711,7 +1711,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1750,7 +1750,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1776,7 +1776,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1802,7 +1802,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1829,7 +1829,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1855,7 +1855,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1881,7 +1881,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1908,7 +1908,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1936,7 +1936,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1963,7 +1963,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1990,7 +1990,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2017,7 +2017,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2046,7 +2046,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2075,7 +2075,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2104,7 +2104,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2135,7 +2135,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2162,7 +2162,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2190,7 +2190,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2219,13 +2219,13 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } #if APACHE if(strcmp(arg2->value.str.val, "-") == 0) - php3_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Use cpdf_output_buffer() instead."); + php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Use cpdf_output_buffer() instead."); #endif cpdf_savePDFmemoryStreamToFile(pdf, arg2->value.str.val); @@ -2266,7 +2266,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2331,14 +2331,14 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } gid=argv[1]->value.lval; im = zend_list_find(gid, &type); if (!im || type != phpi_get_le_gd()) { - php3_error(E_WARNING, "cpdf: Unable to find image pointer"); + php_error(E_WARNING, "cpdf: Unable to find image pointer"); RETURN_FALSE; } @@ -2413,7 +2413,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2472,7 +2472,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2529,7 +2529,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2537,7 +2537,7 @@ lastoutline = zend_list_find(oid,&type); if(!lastoutline || type!=CPDF_GLOBAL(le_outline)) { lastoutline = NULL; -/* php3_error(E_WARNING,"Unable to find last outline entry %d",id); +/* php_error(E_WARNING,"Unable to find last outline entry %d",id); RETURN_FALSE; */ } Index: php4/ext/cpdf/php_cpdf.h diff -u php4/ext/cpdf/php_cpdf.h:1.1 php4/ext/cpdf/php_cpdf.h:1.2 --- php4/ext/cpdf/php_cpdf.h:1.1 Sat Dec 4 14:15:44 1999 +++ php4/ext/cpdf/php_cpdf.h Fri Dec 17 15:54:47 1999 @@ -26,7 +26,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_cpdf.h,v 1.1 1999/12/04 19:15:44 sas Exp $ */ +/* $Id: php_cpdf.h,v 1.2 1999/12/17 20:54:47 zeev Exp $ */ #ifndef _PHP_CPDF_H #define _PHP_CPDF_H @@ -35,7 +35,7 @@ #include <cpdflib.h> -extern php3_module_entry cpdf_module_entry; +extern zend_module_entry cpdf_module_entry; #define cpdf_module_ptr &cpdf_module_entry extern PHP_MINFO_FUNCTION(cpdf); Index: php4/ext/dav/dav.c diff -u php4/ext/dav/dav.c:1.4 php4/ext/dav/dav.c:1.5 --- php4/ext/dav/dav.c:1.4 Sat Dec 4 14:15:45 1999 +++ php4/ext/dav/dav.c Fri Dec 17 15:54:48 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dav.c,v 1.4 1999/12/04 19:15:45 sas Exp $ */ +/* $Id: dav.c,v 1.5 1999/12/17 20:54:48 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL @@ -70,7 +70,7 @@ /* {{{ dynamically loadable module stuff */ # if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &phpdav_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &phpdav_module_entry; }; # endif /* COMPILE_DL */ /* }}} */ @@ -90,7 +90,7 @@ {NULL, NULL, NULL} }; -php3_module_entry phpdav_module_entry = { +zend_module_entry phpdav_module_entry = { "DAV", /* extension name */ phpdav_functions, /* extension function list */ php3_minit_phpdav, /* extension-wide startup function */ Index: php4/ext/dav/php_dav.h diff -u php4/ext/dav/php_dav.h:1.1 php4/ext/dav/php_dav.h:1.2 --- php4/ext/dav/php_dav.h:1.1 Sat Dec 4 14:19:53 1999 +++ php4/ext/dav/php_dav.h Fri Dec 17 15:54:48 1999 @@ -40,7 +40,7 @@ char *mkcol_create_handler; } phpdav_module; -extern php3_module_entry phpdav_module_entry; +extern zend_module_entry phpdav_module_entry; # define phpdav_module_ptr &phpdav_module_entry int phpdav_mkcol_test_handler(request_rec *); Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.15 php4/ext/db/db.c:1.16 --- php4/ext/db/db.c:1.15 Fri Dec 17 14:51:06 1999 +++ php4/ext/db/db.c Fri Dec 17 15:54:49 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.15 1999/12/17 19:51:06 zeev Exp $ */ +/* $Id: db.c,v 1.16 1999/12/17 20:54:49 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -263,7 +263,7 @@ convert_to_string(filename); convert_to_string(mode); - info = _php3_dbmopen(filename->value.str.val, mode->value.str.val); + info = php_dbm_open(filename->value.str.val, mode->value.str.val); if (info) { ret = zend_list_insert(info, DBM_GLOBAL(le_db)); RETURN_LONG(ret); @@ -272,7 +272,7 @@ } } -dbm_info *_php3_dbmopen(char *filename, char *mode) { +dbm_info *php_dbm_open(char *filename, char *mode) { dbm_info *info; int ret, lock=0; char *lockfn = NULL; @@ -289,7 +289,7 @@ PLS_FETCH(); if (filename == NULL) { - php_error(E_WARNING, "NULL filename passed to _php3_dbmopen()"); + php_error(E_WARNING, "NULL filename passed to php_dbm_open()"); return NULL; } @@ -424,7 +424,7 @@ } } -int _php3_dbmclose(dbm_info *info) { +int php_dbm_close(dbm_info *info) { int ret = 0; DBM_TYPE dbf; int lockfd; @@ -475,11 +475,11 @@ RETURN_FALSE; } - ret = _php3_dbminsert(info, key->value.str.val, value->value.str.val); + ret = php_dbm_insert(info, key->value.str.val, value->value.str.val); RETURN_LONG(ret); } -int _php3_dbminsert(dbm_info *info, char *key, char *value) { +int php_dbm_insert(dbm_info *info, char *key, char *value) { datum key_datum, value_datum; int ret; DBM_TYPE dbf; @@ -528,11 +528,11 @@ RETURN_FALSE; } - ret = _php3_dbmreplace(info, key->value.str.val, value->value.str.val); + ret = php_dbm_replace(info, key->value.str.val, value->value.str.val); RETURN_LONG(ret); } -int _php3_dbmreplace(dbm_info *info, char *key, char *value) { +int php_dbm_replace(dbm_info *info, char *key, char *value) { DBM_TYPE dbf; int ret; datum key_datum, value_datum; @@ -582,7 +582,7 @@ RETURN_FALSE; } - return_value->value.str.val = _php3_dbmfetch(info, key->value.str.val); + return_value->value.str.val = php_dbm_fetch(info, key->value.str.val); if (return_value->value.str.val) { return_value->value.str.len = strlen(return_value->value.str.val); return_value->type = IS_STRING; @@ -591,7 +591,7 @@ } } -char *_php3_dbmfetch(dbm_info *info, char *key) { +char *php_dbm_fetch(dbm_info *info, char *key) { datum key_datum, value_datum; char *ret; DBM_TYPE dbf; @@ -1099,7 +1099,7 @@ } #endif - DBM_GLOBAL(le_db) = register_list_destructors(_php3_dbmclose,NULL); + DBM_GLOBAL(le_db) = register_list_destructors(php_dbm_close,NULL); return SUCCESS; } @@ -1144,12 +1144,12 @@ {NULL,NULL,NULL} }; -php3_module_entry dbm_module_entry = { +zend_module_entry dbm_module_entry = { "DBM", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &dbm_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &dbm_module_entry; } #endif #endif Index: php4/ext/db/php_db.h diff -u php4/ext/db/php_db.h:1.1 php4/ext/db/php_db.h:1.2 --- php4/ext/db/php_db.h:1.1 Sat Dec 4 14:19:54 1999 +++ php4/ext/db/php_db.h Fri Dec 17 15:54:50 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_db.h,v 1.1 1999/12/04 19:19:54 sas Exp $ */ +/* $Id: php_db.h,v 1.2 1999/12/17 20:54:50 zeev Exp $ */ #ifndef _PHP_DB_H @@ -40,7 +40,7 @@ #endif -extern php3_module_entry dbm_module_entry; +extern zend_module_entry dbm_module_entry; #define phpext_db_ptr &dbm_module_entry @@ -63,11 +63,11 @@ #endif dbm_info *_php3_finddbm(pval *id,HashTable *list); -int _php3_dbmclose(dbm_info *info); -dbm_info *_php3_dbmopen(char *filename, char *mode); -int _php3_dbminsert(dbm_info *info, char *key, char *value); -char *_php3_dbmfetch(dbm_info *info, char *key); -int _php3_dbmreplace(dbm_info *info, char *key, char *value); +int php_dbm_close(dbm_info *info); +dbm_info *php_dbm_open(char *filename, char *mode); +int php_dbm_insert(dbm_info *info, char *key, char *value); +char *php_dbm_fetch(dbm_info *info, char *key); +int php_dbm_replace(dbm_info *info, char *key, char *value); int _php3_dbmexists(dbm_info *info, char *key); int _php3_dbmdelete(dbm_info *info, char *key); char *_php3_dbmfirstkey(dbm_info *info); Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.8 php4/ext/dba/dba.c:1.9 --- php4/ext/dba/dba.c:1.8 Fri Dec 17 14:51:07 1999 +++ php4/ext/dba/dba.c Fri Dec 17 15:54:51 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.8 1999/12/17 19:51:07 zeev Exp $ */ +/* $Id: dba.c,v 1.9 1999/12/17 20:54:51 zeev Exp $ */ #include "php.h" @@ -62,7 +62,7 @@ static PHP_MSHUTDOWN_FUNCTION(dba); static PHP_MINFO_FUNCTION(dba); -php3_module_entry dba_module_entry = { +zend_module_entry dba_module_entry = { "DataBase API", dba_functions, PHP_MINIT(dba), PHP_MSHUTDOWN(dba), @@ -204,7 +204,7 @@ { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.8 1999/12/17 19:51:07 zeev Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.9 1999/12/17 20:54:51 zeev Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); Index: php4/ext/dba/php_dba.h diff -u php4/ext/dba/php_dba.h:1.1 php4/ext/dba/php_dba.h:1.2 --- php4/ext/dba/php_dba.h:1.1 Sat Dec 4 14:19:54 1999 +++ php4/ext/dba/php_dba.h Fri Dec 17 15:54:51 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dba.h,v 1.1 1999/12/04 19:19:54 sas Exp $ */ +/* $Id: php_dba.h,v 1.2 1999/12/17 20:54:51 zeev Exp $ */ #ifndef _DBA_H #define _DBA_H @@ -53,7 +53,7 @@ struct dba_handler *hnd; } dba_info; -extern php3_module_entry dba_module_entry; +extern zend_module_entry dba_module_entry; #define dba_module_ptr &dba_module_entry /* common prototypes which must be supplied by modules */ Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.13 php4/ext/dbase/dbase.c:1.14 --- php4/ext/dbase/dbase.c:1.13 Fri Dec 17 14:51:08 1999 +++ php4/ext/dbase/dbase.c Fri Dec 17 15:54:52 1999 @@ -724,13 +724,13 @@ {NULL, NULL, NULL} }; -php3_module_entry dbase_module_entry = { +zend_module_entry dbase_module_entry = { "DBase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if defined(COMPILE_DL) -DLEXPORT php3_module_entry *get_module(void) { return &dbase_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &dbase_module_entry; } #if (WIN32|WINNT) && defined(THREAD_SAFE) Index: php4/ext/dbase/php_dbase.h diff -u php4/ext/dbase/php_dbase.h:1.3 php4/ext/dbase/php_dbase.h:1.4 --- php4/ext/dbase/php_dbase.h:1.3 Tue Jul 27 13:09:35 1999 +++ php4/ext/dbase/php_dbase.h Fri Dec 17 15:54:52 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dbase.h,v 1.3 1999/07/27 17:09:35 andrey Exp $ */ +/* $Id: php_dbase.h,v 1.4 1999/12/17 20:54:52 zeev Exp $ */ #ifndef _DBASE_H #define _DBASE_H #if DBASE -extern php3_module_entry dbase_module_entry; +extern zend_module_entry dbase_module_entry; #define dbase_module_ptr &dbase_module_entry extern PHP_MINIT_FUNCTION(dbase); Index: php4/ext/domxml/domxml.c diff -u php4/ext/domxml/domxml.c:1.4 php4/ext/domxml/domxml.c:1.5 --- php4/ext/domxml/domxml.c:1.4 Tue Dec 7 05:49:16 1999 +++ php4/ext/domxml/domxml.c Fri Dec 17 15:54:53 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domxml.c,v 1.4 1999/12/07 10:49:16 steinm Exp $ */ +/* $Id: domxml.c,v 1.5 1999/12/17 20:54:53 zeev Exp $ */ #include "php.h" @@ -70,7 +70,7 @@ {NULL, NULL, NULL} }; -php3_module_entry php3_domxml_module_entry = { +zend_module_entry php3_domxml_module_entry = { "DOM", php_domxml_functions, PHP_MINIT(domxml), NULL, NULL, NULL, PHP_MINFO(domxml), STANDARD_MODULE_PROPERTIES }; Index: php4/ext/domxml/php_domxml.h diff -u php4/ext/domxml/php_domxml.h:1.1 php4/ext/domxml/php_domxml.h:1.2 --- php4/ext/domxml/php_domxml.h:1.1 Sat Dec 4 14:15:47 1999 +++ php4/ext/domxml/php_domxml.h Fri Dec 17 15:54:53 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php_domxml.h,v 1.1 1999/12/04 19:15:47 sas Exp $ */ +/* $Id: php_domxml.h,v 1.2 1999/12/17 20:54:53 zeev Exp $ */ #ifndef _PHP_DOMXML_H #define _PHP_DOMXML_H @@ -37,7 +37,7 @@ #if HAVE_DOMXML #include <gnome-xml/parser.h> -extern php3_module_entry php3_domxml_module_entry; +extern zend_module_entry php3_domxml_module_entry; #define php3_domxml_module_ptr &php3_domxml_module_entry /* directory functions */ Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.13 php4/ext/fdf/fdf.c:1.14 --- php4/ext/fdf/fdf.c:1.13 Fri Dec 17 14:51:10 1999 +++ php4/ext/fdf/fdf.c Fri Dec 17 15:54:54 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.13 1999/12/17 19:51:10 zeev Exp $ */ +/* $Id: fdf.c,v 1.14 1999/12/17 20:54:54 zeev Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -80,14 +80,14 @@ {NULL, NULL, NULL} }; -php3_module_entry fdf_module_entry = { +zend_module_entry fdf_module_entry = { "fdf", fdf_functions, PHP_MINIT(fdf), PHP_MSHUTDOWN(fdf), NULL, NULL, PHP_MINFO(fdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &fdf_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &fdf_module_entry; } #endif static void phpi_FDFClose(FDFDoc fdf) { @@ -548,7 +548,7 @@ id=(*arg1)->value.lval; fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } Index: php4/ext/fdf/php_fdf.h diff -u php4/ext/fdf/php_fdf.h:1.1 php4/ext/fdf/php_fdf.h:1.2 --- php4/ext/fdf/php_fdf.h:1.1 Sat Dec 4 14:19:55 1999 +++ php4/ext/fdf/php_fdf.h Fri Dec 17 15:54:55 1999 @@ -26,7 +26,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_fdf.h,v 1.1 1999/12/04 19:19:55 sas Exp $ */ +/* $Id: php_fdf.h,v 1.2 1999/12/17 20:54:55 zeev Exp $ */ #ifndef _PHP_FDF_H #define _PHP_FDF_H @@ -39,7 +39,7 @@ #include <FdfTk.h> -extern php3_module_entry fdf_module_entry; +extern zend_module_entry fdf_module_entry; #define phpext_fdf_ptr &fdf_module_entry extern PHP_MINIT_FUNCTION(fdf); Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.9 php4/ext/filepro/filepro.c:1.10 --- php4/ext/filepro/filepro.c:1.9 Fri Dec 17 14:16:39 1999 +++ php4/ext/filepro/filepro.c Fri Dec 17 15:54:56 1999 @@ -131,14 +131,14 @@ {NULL, NULL, NULL} }; -php3_module_entry filepro_module_entry = { +zend_module_entry filepro_module_entry = { "FilePro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &filepro_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &filepro_module_entry; } #if (WIN32|WINNT) && defined(THREAD_SAFE) /*NOTE: You should have an odbc.def file where you Index: php4/ext/filepro/php_filepro.h diff -u php4/ext/filepro/php_filepro.h:1.2 php4/ext/filepro/php_filepro.h:1.3 --- php4/ext/filepro/php_filepro.h:1.2 Tue Jul 27 15:44:44 1999 +++ php4/ext/filepro/php_filepro.h Fri Dec 17 15:54:56 1999 @@ -34,12 +34,12 @@ */ -/* $Id: php_filepro.h,v 1.2 1999/07/27 19:44:44 andrey Exp $ */ +/* $Id: php_filepro.h,v 1.3 1999/12/17 20:54:56 zeev Exp $ */ #ifndef _FILEPRO_H #define _FILEPRO_H #if HAVE_FILEPRO -extern php3_module_entry filepro_module_entry; +extern zend_module_entry filepro_module_entry; #define phpext_filepro_ptr &filepro_module_entry PHP_FUNCTION(filepro); Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.11 php4/ext/ftp/php_ftp.c:1.12 --- php4/ext/ftp/php_ftp.c:1.11 Fri Dec 17 14:51:11 1999 +++ php4/ext/ftp/php_ftp.c Fri Dec 17 15:54:57 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.11 1999/12/17 19:51:11 zeev Exp $ */ +/* $Id: php_ftp.c,v 1.12 1999/12/17 20:54:57 zeev Exp $ */ #include "php.h" @@ -37,7 +37,7 @@ #ifndef ZEND_VERSION #include "internal_functions.h" #include "php3_list.h" -#define php_error php3_error +#define php_error php_error #endif #include "ext/standard/file.h" @@ -72,7 +72,7 @@ {NULL, NULL, NULL} }; -php3_module_entry php3_ftp_module_entry = { +zend_module_entry php3_ftp_module_entry = { "FTP Functions", php3_ftp_functions, #ifdef ZEND_VERSION Index: php4/ext/ftp/php_ftp.h diff -u php4/ext/ftp/php_ftp.h:1.6 php4/ext/ftp/php_ftp.h:1.7 --- php4/ext/ftp/php_ftp.h:1.6 Mon Oct 4 14:30:37 1999 +++ php4/ext/ftp/php_ftp.h Fri Dec 17 15:54:57 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.h,v 1.6 1999/10/04 18:30:37 askalski Exp $ */ +/* $Id: php_ftp.h,v 1.7 1999/12/17 20:54:57 zeev Exp $ */ #ifndef _INCLUDED_FTP_H #define _INCLUDED_FTP_H @@ -40,7 +40,7 @@ #if HAVE_FTP -extern php3_module_entry php3_ftp_module_entry; +extern zend_module_entry php3_ftp_module_entry; #define php3_ftp_module_ptr &php3_ftp_module_entry #ifdef ZEND_VERSION Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.30 php4/ext/gd/gd.c:1.31 --- php4/ext/gd/gd.c:1.30 Fri Dec 17 14:51:12 1999 +++ php4/ext/gd/gd.c Fri Dec 17 15:54:58 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.30 1999/12/17 19:51:12 zeev Exp $ */ +/* $Id: gd.c,v 1.31 1999/12/17 20:54:58 zeev Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -131,13 +131,13 @@ {NULL, NULL, NULL} }; -php3_module_entry gd_module_entry = { +zend_module_entry gd_module_entry = { "gd", gd_functions, PHP_MINIT(gd), PHP_MSHUTDOWN(gd), NULL, NULL, PHP_MINFO(gd), STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_GD # include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &gd_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &gd_module_entry; } #endif @@ -416,7 +416,7 @@ #endif if (!fp) { php_strip_url_passwd(fn); - php3_error(E_WARNING, + php_error(E_WARNING, "ImageCreateFromPng: Unable to open %s for reading", fn); RETURN_FALSE; } @@ -448,19 +448,19 @@ convert_to_string(file); fn = file->value.str.val; if (!fn || fn == empty_string || php_check_open_basedir(fn)) { - php3_error(E_WARNING, "ImagePng: Invalid filename"); + php_error(E_WARNING, "ImagePng: Invalid filename"); RETURN_FALSE; } } im = zend_list_find(imgind->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { - php3_error(E_WARNING, "ImagePng: unable to find image pointer"); + php_error(E_WARNING, "ImagePng: unable to find image pointer"); RETURN_FALSE; } if (argc == 2) { fp = fopen(fn, "wb"); if (!fp) { - php3_error(E_WARNING, "ImagePng: unable to open %s for writing", fn); + php_error(E_WARNING, "ImagePng: unable to open %s for writing", fn); RETURN_FALSE; } gdImagePng (im,fp); @@ -473,7 +473,7 @@ char buf[4096]; tmp = tmpfile(); if (tmp == NULL) { - php3_error(E_WARNING, "Unable to open temporary file"); + php_error(E_WARNING, "Unable to open temporary file"); RETURN_FALSE; } output = php_header(); Index: php4/ext/gd/gdt1.c diff -u php4/ext/gd/gdt1.c:1.2 php4/ext/gd/gdt1.c:1.3 --- php4/ext/gd/gdt1.c:1.2 Fri Dec 17 14:51:13 1999 +++ php4/ext/gd/gdt1.c Fri Dec 17 15:54:58 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gdt1.c,v 1.2 1999/12/17 19:51:13 zeev Exp $ */ +/* $Id: gdt1.c,v 1.3 1999/12/17 20:54:58 zeev Exp $ */ void _php3_free_ps_font(gd_ps_font *f_ind) { @@ -51,16 +51,16 @@ efree(f_ind); switch (l_ind) { case -1: - php3_error(E_WARNING, "Couldn't find the font file"); + php_error(E_WARNING, "Couldn't find the font file"); RETURN_FALSE; break; case -2: case -3: - php3_error(E_WARNING, "Memory allocation fault in t1lib"); + php_error(E_WARNING, "Memory allocation fault in t1lib"); RETURN_FALSE; break; default: - php3_error(E_WARNING, "An unknown error occurred in t1lib"); + php_error(E_WARNING, "An unknown error occurred in t1lib"); RETURN_FALSE; break; } @@ -91,7 +91,7 @@ of_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -103,19 +103,19 @@ efree(nf_ind); switch (l_ind) { case -1: - php3_error(E_WARNING, "FontID %d is not loaded in memory", l_ind); + php_error(E_WARNING, "FontID %d is not loaded in memory", l_ind); RETURN_FALSE; break; case -2: - php3_error(E_WARNING, "Tried to copy a logical font"); + php_error(E_WARNING, "Tried to copy a logical font"); RETURN_FALSE; break; case -3: - php3_error(E_WARNING, "Memory allocation fault in t1lib"); + php_error(E_WARNING, "Memory allocation fault in t1lib"); RETURN_FALSE; break; default: - php3_error(E_WARNING, "An unknown error occurred in t1lib"); + php_error(E_WARNING, "An unknown error occurred in t1lib"); RETURN_FALSE; break; } @@ -143,7 +143,7 @@ zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -170,19 +170,19 @@ f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } if ((enc_vector = T1_LoadEncoding(enc->value.str.val)) == NULL) { - php3_error(E_WARNING, "Couldn't load encoding vector from %s", enc->value.str.val); + php_error(E_WARNING, "Couldn't load encoding vector from %s", enc->value.str.val); RETURN_FALSE; } T1_DeleteAllSizes(f_ind->font_id); if (T1_ReencodeFont(f_ind->font_id, enc_vector)) { T1_DeleteEncoding(enc_vector); - php3_error(E_WARNING, "Couldn't reencode font"); + php_error(E_WARNING, "Couldn't reencode font"); RETURN_FALSE; } zend_list_insert(enc_vector, GD_GLOBAL(le_ps_enc)); @@ -207,7 +207,7 @@ f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -234,7 +234,7 @@ f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -312,14 +312,14 @@ bg_img = zend_list_find(img->value.lval, &type); if (!bg_img || type != GD_GLOBAL(le_gd)) { - php3_error(E_WARNING, "Unable to find image pointer"); + php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; } f_ind = zend_list_find(fnt->value.lval, &type); if (!f_ind || type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -349,7 +349,7 @@ T1_AASetLevel(T1_AA_HIGH); break; default: - php3_error(E_WARNING, "Invalid value %d as number of steps for antialiasing", aa_steps); + php_error(E_WARNING, "Invalid value %d as number of steps for antialiasing", aa_steps); RETURN_FALSE; } @@ -374,7 +374,7 @@ } str_img = T1_AAFillOutline(str_path, 0); #else - php3_error(E_WARNING, "Setting space between characters in function ImagePSText is supported only with t1lib version 0.9 or above"); + php_error(E_WARNING, "Setting space between characters in function ImagePSText is supported only with t1lib version 0.9 or above"); RETURN_FALSE; #endif } else { @@ -457,7 +457,7 @@ f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.1 php4/ext/gd/php_gd.h:1.2 --- php4/ext/gd/php_gd.h:1.1 Sat Dec 4 14:19:55 1999 +++ php4/ext/gd/php_gd.h Fri Dec 17 15:54:58 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php_gd.h,v 1.1 1999/12/04 19:19:55 sas Exp $ */ +/* $Id: php_gd.h,v 1.2 1999/12/17 20:54:58 zeev Exp $ */ #ifndef _PHP_GD_H #define _PHP_GD_H @@ -49,7 +49,7 @@ #include <gd.h> -extern php3_module_entry gd_module_entry; +extern zend_module_entry gd_module_entry; #define phpext_gd_ptr &gd_module_entry /* gd.c functions */ Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.9 php4/ext/gettext/gettext.c:1.10 --- php4/ext/gettext/gettext.c:1.9 Sat Dec 4 14:15:49 1999 +++ php4/ext/gettext/gettext.c Fri Dec 17 15:55:00 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.9 1999/12/04 19:15:49 sas Exp $ */ +/* $Id: gettext.c,v 1.10 1999/12/17 20:55:00 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -36,7 +36,7 @@ {NULL, NULL, NULL} }; -php3_module_entry php3_gettext_module_entry = { +zend_module_entry php3_gettext_module_entry = { "gettext", php3_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES }; Index: php4/ext/gettext/php_gettext.h diff -u php4/ext/gettext/php_gettext.h:1.1 php4/ext/gettext/php_gettext.h:1.2 --- php4/ext/gettext/php_gettext.h:1.1 Sat Dec 4 14:19:56 1999 +++ php4/ext/gettext/php_gettext.h Fri Dec 17 15:55:00 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gettext.h,v 1.1 1999/12/04 19:19:56 sas Exp $ */ +/* $Id: php_gettext.h,v 1.2 1999/12/17 20:55:00 zeev Exp $ */ #ifndef _GETTEXT_H #define _GETTEXT_H @@ -37,7 +37,7 @@ #include "modules.h" #endif -extern php3_module_entry php3_gettext_module_entry; +extern zend_module_entry php3_gettext_module_entry; #define gettext_module_ptr &php3_gettext_module_entry PHP_MINFO_FUNCTION(gettext); Index: php4/ext/hyperwave/hg_comm.c diff -u php4/ext/hyperwave/hg_comm.c:1.15 php4/ext/hyperwave/hg_comm.c:1.16 --- php4/ext/hyperwave/hg_comm.c:1.15 Tue Dec 7 05:49:18 1999 +++ php4/ext/hyperwave/hg_comm.c Fri Dec 17 15:55:01 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hg_comm.c,v 1.15 1999/12/07 10:49:18 steinm Exp $ */ +/* $Id: hg_comm.c,v 1.16 1999/12/17 20:55:01 zeev Exp $ */ /* #define HW_DEBUG */ @@ -1178,38 +1178,38 @@ hg_msg *msg; if ( (msg = (hg_msg *)emalloc(sizeof(hg_msg))) == NULL ) { -/* php3_printf("recv_hg_msg"); */ +/* php_printf("recv_hg_msg"); */ lowerror = LE_MALLOC; return(NULL); } if ( hg_read_exact(sockfd, (char *)&(msg->length), 4) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (1) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (1) returned -1\n"); */ efree(msg); return(NULL); } if ( hg_read_exact(sockfd, (char *)&(msg->version_msgid), 4) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (2) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (2) returned -1\n"); */ efree(msg); return(NULL); } if ( hg_read_exact(sockfd, (char *)&(msg->msg_type), 4) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (3) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (3) returned -1\n"); */ efree(msg); return(NULL); } if ( msg->length > HEADER_LENGTH ) { if ( (msg->buf = (char *) emalloc(msg->length-HEADER_LENGTH)) == NULL ) { -/* php3_printf("recv_hg_msg"); */ +/* php_printf("recv_hg_msg"); */ lowerror = LE_MALLOC; efree(msg); return(NULL); } if ( hg_read_exact(sockfd, msg->buf, msg->length-HEADER_LENGTH) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (4) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (4) returned -1\n"); */ efree(msg->buf); efree(msg); return(NULL); @@ -1219,7 +1219,7 @@ msg->buf = NULL; #ifdef HW_DEBUG - php3_printf("<B> Recv msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); + php_printf("<B> Recv msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); #endif return(msg); } @@ -1230,11 +1230,11 @@ hg_msg *ready_msg; if ( (ready_msg = recv_hg_msg(sockfd)) == NULL ) { -/* php3_printf("recv_ready: recv_hg_msg returned NULL\n"); */ +/* php_printf("recv_ready: recv_hg_msg returned NULL\n"); */ return(NULL); } if ( ready_msg->msg_type != READY_MESSAGE ) { -/* php3_printf("recv_ready: recv_hg_msg returned wrong message: %d, %d \n", ready_msg->length, ready_msg->msg_type); */ +/* php_printf("recv_ready: recv_hg_msg returned wrong message: %d, %d \n", ready_msg->length, ready_msg->msg_type); */ efree(ready_msg); return(NULL); } @@ -4106,7 +4106,7 @@ */ if(host) { if((hostptr = gethostbyname(host)) == NULL) { - php3_error(E_WARNING, "gethostbyname failed for %s", host); + php_error(E_WARNING, "gethostbyname failed for %s", host); HWSOCK_FCLOSE(fd); return(-2); } @@ -4189,7 +4189,7 @@ */ len = sizeof(serv_addr); if((newfd = accept(fd, (struct sockaddr *) &serv_addr, &len)) < 0) { -/* php3_printf("client: can't open data connection to server\n"); */ +/* php_printf("client: can't open data connection to server\n"); */ if(attributes) efree(attributes); HWSOCK_FCLOSE(fd); return(-8); @@ -4284,7 +4284,7 @@ */ if(host) { if((hostptr = gethostbyname(host)) == NULL) { - php3_error(E_WARNING, "gethostbyname failed for %s", host); + php_error(E_WARNING, "gethostbyname failed for %s", host); HWSOCK_FCLOSE(fd); return(-1); } @@ -4302,7 +4302,7 @@ hostip = inet_ntoa(*ptr1); break; default: -/* php3_printf(stderr, "unknown address type\n"); */ +/* php_printf(stderr, "unknown address type\n"); */ break; } @@ -4467,7 +4467,7 @@ */ if(host) { if((hostptr = gethostbyname(host)) == NULL) { - php3_error(E_WARNING, "gethostbyname failed for %s", host); + php_error(E_WARNING, "gethostbyname failed for %s", host); /* close(fd); fd is not set yet */ return(-4); } @@ -4757,7 +4757,7 @@ char *buf, *tmp; #ifdef HW_DEBUG - php3_printf("<B>Sending msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); + php_printf("<B>Sending msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); #endif if ( length < HEADER_LENGTH ) { /* fprintf(stderr, "send_hg_msg: bad msg\n"); */ @@ -4869,7 +4869,7 @@ int tmp; #ifdef HW_DEBUG - php3_printf(" Added int to header: <B>%d</B><BR>\n", val); + php_printf(" Added int to header: <B>%d</B><BR>\n", val); #endif tmp = swap_on ? swap(val) : val; memcpy(buf, (char *)&tmp, 4); @@ -4883,7 +4883,7 @@ int len = strlen(str)+1; #ifdef HW_DEBUG - php3_printf(" Added str to header: <B>%s</B> (%d)<BR>\n", str, strlen(str)); + php_printf(" Added str to header: <B>%s</B> (%d)<BR>\n", str, strlen(str)); #endif memcpy(buf, str, len); Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.31 php4/ext/hyperwave/hw.c:1.32 --- php4/ext/hyperwave/hw.c:1.31 Fri Dec 17 14:51:14 1999 +++ php4/ext/hyperwave/hw.c Fri Dec 17 15:55:01 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.31 1999/12/17 19:51:14 zeev Exp $ */ +/* $Id: hw.c,v 1.32 1999/12/17 20:55:01 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -115,7 +115,7 @@ {NULL, NULL, NULL} }; -php3_module_entry hw_module_entry = { +zend_module_entry hw_module_entry = { "HyperWave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), 0, 0, 0, NULL }; @@ -126,13 +126,13 @@ #endif #ifdef COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &hw_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &hw_module_entry; } #endif void print_msg(hg_msg *msg, char *str, int txt); #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &hw_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &hw_module_entry; } #endif void _close_hw_link(hw_connection *conn) @@ -3609,13 +3609,13 @@ id=(*arg3)->value.lval; ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { - php3_error(E_WARNING,"Unable to find file identifier %d",link); + php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; } set_swap(ptr->swap_on); if (0 != (ptr->lasterror = send_mapid(ptr->socket, servid, id, &virtid))) { - php3_error(E_WARNING, "send_command (mapid) returned %d\n", ptr->lasterror); + php_error(E_WARNING, "send_command (mapid) returned %d\n", ptr->lasterror); RETURN_FALSE; } RETURN_LONG(virtid); Index: php4/ext/hyperwave/php_hyperwave.h diff -u php4/ext/hyperwave/php_hyperwave.h:1.1 php4/ext/hyperwave/php_hyperwave.h:1.2 --- php4/ext/hyperwave/php_hyperwave.h:1.1 Sat Dec 4 14:19:56 1999 +++ php4/ext/hyperwave/php_hyperwave.h Fri Dec 17 15:55:02 1999 @@ -23,7 +23,7 @@ */ -/* $Id: php_hyperwave.h,v 1.1 1999/12/04 19:19:56 sas Exp $ */ +/* $Id: php_hyperwave.h,v 1.2 1999/12/17 20:55:02 zeev Exp $ */ #ifndef _HW_H #define _HW_H @@ -50,7 +50,7 @@ #include "hg_comm.h" -extern php3_module_entry hw_module_entry; +extern zend_module_entry hw_module_entry; #define hw_module_ptr &hw_module_entry typedef struct { Index: php4/ext/icap/php3_icap.c diff -u php4/ext/icap/php3_icap.c:1.14 php4/ext/icap/php3_icap.c:1.15 --- php4/ext/icap/php3_icap.c:1.14 Fri Dec 17 14:51:15 1999 +++ php4/ext/icap/php3_icap.c Fri Dec 17 15:55:03 1999 @@ -94,13 +94,13 @@ }; -php3_module_entry php3_icap_module_entry = { +zend_module_entry php3_icap_module_entry = { CALVER, icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &php3_icap_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &php3_icap_module_entry; } #endif /* @@ -127,11 +127,11 @@ PHP_MINFO_FUNCTION(icap) { - php3_printf("Icap Support enabled<br>"); - php3_printf("<table>"); - php3_printf("<tr><td>Icap Version:</td>"); - php3_printf("<td>%s</td>",CALVER); - php3_printf("</tr></table>"); + php_printf("Icap Support enabled<br>"); + php_printf("<table>"); + php_printf("<tr><td>Icap Version:</td>"); + php_printf("<td>%s</td>",CALVER); + php_printf("</tr></table>"); } PHP_MINIT_FUNCTION(icap) @@ -185,7 +185,7 @@ } icap_stream = cal_open(NULL,calendar->value.str.val,0); if (!icap_stream) { - php3_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); + php_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); RETURN_FALSE; } @@ -216,7 +216,7 @@ ind = streamind->value.lval; icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==2) { @@ -267,7 +267,7 @@ ind = streamind->value.lval; icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -280,7 +280,7 @@ // icap_stream = cal_connect(calendar->value.str.val); // cal_login(icap_stream, calendar->value.str.val); if (icap_stream == NULL) { - php3_error(E_WARNING,"Couldn't re-open stream\n"); + php_error(E_WARNING,"Couldn't re-open stream\n"); RETURN_FALSE; } RETURN_TRUE; @@ -308,7 +308,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -336,7 +336,7 @@ ind = streamind->value.lval; icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==3) { @@ -414,7 +414,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -424,34 +424,34 @@ } begincal.has_time=0; endcal.has_time=0; - if(_php3_hash_find(begindate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(begindate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); begincal.year=(*pvalue)->value.lval; } - if(_php3_hash_find(begindate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(begindate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); begincal.mon=(*pvalue)->value.lval; } - if(_php3_hash_find(begindate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(begindate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); begincal.mday=(*pvalue)->value.lval; } if(myargc == 3) { - if(_php3_hash_find(enddate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(enddate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); endcal.year=(*pvalue)->value.lval; } - if(_php3_hash_find(enddate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(enddate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); endcal.mon=(*pvalue)->value.lval; } - if(_php3_hash_find(enddate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(enddate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); endcal.mday=(*pvalue)->value.lval; @@ -492,7 +492,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -528,7 +528,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -566,7 +566,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -575,28 +575,28 @@ } mydate.has_date=1; mydate.has_time=1; - if(_php3_hash_find(date->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(date->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.year=(*pvalue)->value.lval; } - if(_php3_hash_find(date->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(date->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.mon=(*pvalue)->value.lval; } - if(_php3_hash_find(date->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(date->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.mday=(*pvalue)->value.lval; } - if(_php3_hash_find(time->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(time->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.hour=(*pvalue)->value.lval; } - if(_php3_hash_find(time->value.ht,"minute",sizeof("minute"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(time->value.ht,"minute",sizeof("minute"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.min=(*pvalue)->value.lval; @@ -636,7 +636,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -671,7 +671,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if (cal_remove(icap_le_struct->icap_stream,uid->value.lval)) @@ -725,7 +725,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -734,69 +734,69 @@ RETURN_FALSE; } myevent=calevent_new(); - if(_php3_hash_find(storeobject->value.ht,"uid",sizeof("uid"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"uid",sizeof("uid"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->id=(*pvalue)->value.lval; } - if(_php3_hash_find(storeobject->value.ht,"public",sizeof("public"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"public",sizeof("public"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->public=(*pvalue)->value.lval; } - if(_php3_hash_find(storeobject->value.ht,"category",sizeof("category"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"category",sizeof("category"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_string(*pvalue); myevent->category=strdup((*pvalue)->value.str.val); } - if(_php3_hash_find(storeobject->value.ht,"title",sizeof("title"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"title",sizeof("title"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_string(*pvalue); myevent->title=strdup((*pvalue)->value.str.val); } - if(_php3_hash_find(storeobject->value.ht,"description",sizeof("description"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"description",sizeof("description"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_string(*pvalue); myevent->description=strdup((*pvalue)->value.str.val); } - if(_php3_hash_find(storeobject->value.ht,"alarm",sizeof("alarm"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"alarm",sizeof("alarm"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->alarm=(*pvalue)->value.lval; } - if(_php3_hash_find(storeobject->value.ht,"start",sizeof("start"),(void **) &temppvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"start",sizeof("start"),(void **) &temppvalue)== SUCCESS){ SEPARATE_ZVAL(temppvalue); convert_to_array(*temppvalue); - if(_php3_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.year=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.mon=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.mday=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.hour=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.min=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.sec=(*pvalue)->value.lval; @@ -804,36 +804,36 @@ myevent->start.has_date=true; } - if(_php3_hash_find(storeobject->value.ht,"end",sizeof("end"),(void **) &temppvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"end",sizeof("end"),(void **) &temppvalue)== SUCCESS){ SEPARATE_ZVAL(temppvalue); convert_to_array(*temppvalue); - if(_php3_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.year=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.mon=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.mday=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.hour=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.min=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.sec=(*pvalue)->value.lval; @@ -870,7 +870,7 @@ icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } Index: php4/ext/icap/php_icap.h diff -u php4/ext/icap/php_icap.h:1.1 php4/ext/icap/php_icap.h:1.2 --- php4/ext/icap/php_icap.h:1.1 Sat Dec 4 14:19:57 1999 +++ php4/ext/icap/php_icap.h Fri Dec 17 15:55:03 1999 @@ -1,4 +1,4 @@ -/* $Id: php_icap.h,v 1.1 1999/12/04 19:19:57 sas Exp $ */ +/* $Id: php_icap.h,v 1.2 1999/12/17 20:55:03 zeev Exp $ */ #ifndef _INCLUDED_ICAP_H #define _INCLUDED_ICAP_H @@ -21,7 +21,7 @@ PHP_MINFO_FUNCTION(icap); /* Functions accessable to PHP */ -extern php3_module_entry php3_icap_module_entry; +extern zend_module_entry php3_icap_module_entry; #define php3_icap_module_ptr &php3_icap_module_entry #define phpext_icap_ptr php3_icap_module_ptr Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.21 php4/ext/imap/imap.c:1.22 --- php4/ext/imap/imap.c:1.21 Fri Dec 17 14:51:16 1999 +++ php4/ext/imap/imap.c Fri Dec 17 15:55:04 1999 @@ -21,7 +21,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.21 1999/12/17 19:51:16 zeev Exp $ */ +/* $Id: imap.c,v 1.22 1999/12/17 20:55:04 zeev Exp $ */ #define IMAP41 @@ -2638,7 +2638,7 @@ ind = streamind->value.lval; imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || !IS_STREAM(ind_type)) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } Index: php4/ext/informix/php_informix.h diff -u php4/ext/informix/php_informix.h:1.5 php4/ext/informix/php_informix.h:1.6 --- php4/ext/informix/php_informix.h:1.5 Sun Nov 14 07:55:32 1999 +++ php4/ext/informix/php_informix.h Fri Dec 17 15:55:05 1999 @@ -57,7 +57,7 @@ #include "TSRM.h" #endif -extern php3_module_entry ifx_module_entry; +extern zend_module_entry ifx_module_entry; #define ifx_module_ptr &ifx_module_entry Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.10 php4/ext/interbase/interbase.c:1.11 --- php4/ext/interbase/interbase.c:1.10 Fri Dec 17 14:51:18 1999 +++ php4/ext/interbase/interbase.c Fri Dec 17 15:55:06 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.10 1999/12/17 19:51:18 zeev Exp $ */ +/* $Id: interbase.c,v 1.11 1999/12/17 20:55:06 zeev Exp $ */ /* TODO: A lot... */ @@ -46,7 +46,7 @@ {NULL, NULL, NULL} }; -php3_module_entry ibase_module_entry = +zend_module_entry ibase_module_entry = { "InterBase", ibase_functions, Index: php4/ext/interbase/php_interbase.h diff -u php4/ext/interbase/php_interbase.h:1.1 php4/ext/interbase/php_interbase.h:1.2 --- php4/ext/interbase/php_interbase.h:1.1 Sat Dec 4 14:19:57 1999 +++ php4/ext/interbase/php_interbase.h Fri Dec 17 15:55:06 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_interbase.h,v 1.1 1999/12/04 19:19:57 sas Exp $ */ +/* $Id: php_interbase.h,v 1.2 1999/12/17 20:55:06 zeev Exp $ */ #ifndef _PHP3_IBASE_H #define _PHP3_IBASE_H @@ -41,7 +41,7 @@ #if HAVE_IBASE #include <ibase.h> -extern php3_module_entry ibase_module_entry; +extern zend_module_entry ibase_module_entry; #define php3_ibase_module_ptr &ibase_module_entry extern PHP_MINIT_FUNCTION(ibase); Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.4 php4/ext/java/java.c:1.5 --- php4/ext/java/java.c:1.4 Fri Dec 17 14:51:19 1999 +++ php4/ext/java/java.c Fri Dec 17 15:55:07 1999 @@ -433,7 +433,7 @@ DISPLAY_INI_ENTRIES(); } -php3_module_entry java_module_entry = { +zend_module_entry java_module_entry = { "java", java_functions, PHP_MINIT(java), Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.18 php4/ext/ldap/ldap.c:1.19 --- php4/ext/ldap/ldap.c:1.18 Fri Dec 17 14:51:19 1999 +++ php4/ext/ldap/ldap.c Fri Dec 17 15:55:08 1999 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.18 1999/12/17 19:51:19 zeev Exp $ */ +/* $Id: ldap.c,v 1.19 1999/12/17 20:55:08 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -97,7 +97,7 @@ }; -php3_module_entry ldap_module_entry = { +zend_module_entry ldap_module_entry = { "LDAP", ldap_functions, PHP_MINIT(ldap), PHP_MSHUTDOWN(ldap), NULL, NULL, PHP_MINFO(ldap), STANDARD_MODULE_PROPERTIES }; @@ -105,7 +105,7 @@ #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void ) { return &ldap_module_entry; } +DLEXPORT zend_module_entry *get_module(void ) { return &ldap_module_entry; } #endif @@ -277,7 +277,7 @@ php_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.18 1999/12/17 19:51:19 zeev Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.19 1999/12/17 20:55:08 zeev Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" Index: php4/ext/ldap/php_ldap.h diff -u php4/ext/ldap/php_ldap.h:1.1 php4/ext/ldap/php_ldap.h:1.2 --- php4/ext/ldap/php_ldap.h:1.1 Sat Dec 4 14:15:53 1999 +++ php4/ext/ldap/php_ldap.h Fri Dec 17 15:55:08 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php_ldap.h,v 1.1 1999/12/04 19:15:53 sas Exp $ */ +/* $Id: php_ldap.h,v 1.2 1999/12/17 20:55:08 zeev Exp $ */ #ifndef _PHP_LDAP_H #define _PHP_LDAP_H @@ -43,7 +43,7 @@ #include <lber.h> #include <ldap.h> -extern php3_module_entry ldap_module_entry; +extern zend_module_entry ldap_module_entry; #define ldap_module_ptr &ldap_module_entry /* LDAP functions */ Index: php4/ext/mcal/php3_mcal.c diff -u php4/ext/mcal/php3_mcal.c:1.10 php4/ext/mcal/php3_mcal.c:1.11 --- php4/ext/mcal/php3_mcal.c:1.10 Fri Dec 17 14:51:20 1999 +++ php4/ext/mcal/php3_mcal.c Fri Dec 17 15:55:09 1999 @@ -125,15 +125,15 @@ }; #ifdef ZEND_VERSION -php3_module_entry php3_mcal_module_entry = { +zend_module_entry php3_mcal_module_entry = { CALVER, mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), 0, 0, 0, NULL }; #else -php3_module_entry php3_mcal_module_entry = {"mcal", mcal_functions, PHP_MINIT_FUNCTION, NULL, NULL, NULL, PHP_MINFO_FUNCTION, 0, 0, 0, NULL}; +zend_module_entry php3_mcal_module_entry = {"mcal", mcal_functions, PHP_MINIT_FUNCTION, NULL, NULL, NULL, PHP_MINFO_FUNCTION, 0, 0, 0, NULL}; #endif #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &php3_mcal_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &php3_mcal_module_entry; } #endif /* @@ -160,11 +160,11 @@ void PHP_MINFO_FUNCTION(void) #endif { - php3_printf("Mcal Support enabled<br>"); - php3_printf("<table>"); - php3_printf("<tr><td>Mcal Version:</td>"); - php3_printf("<td>%s</td>",CALVER); - php3_printf("</tr></table>"); + php_printf("Mcal Support enabled<br>"); + php_printf("<table>"); + php_printf("<tr><td>Mcal Version:</td>"); + php_printf("<td>%s</td>",CALVER); + php_printf("</tr></table>"); } #ifdef ZEND_VERSION @@ -234,7 +234,7 @@ } return zend_hash_update(symtable, key, strlen(key)+1, (void *) &tmp, sizeof(pval *), NULL); #else - return _php3_hash_update(arg->value.ht, key, strlen(key)+1, (void *) &tmp, sizeof(pval), NULL); + return zend_hash_update(arg->value.ht, key, strlen(key)+1, (void *) &tmp, sizeof(pval), NULL); #endif } @@ -264,11 +264,11 @@ if(myargc ==4) { convert_to_long(options); flags=options->value.lval; - php3_printf("option is: %d\n",options->value.lval); + php_printf("option is: %d\n",options->value.lval); } mcal_stream = cal_open(NULL,calendar->value.str.val,0); if (!mcal_stream) { - php3_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); + php_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); RETURN_FALSE; } @@ -300,7 +300,7 @@ ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==2) { @@ -351,7 +351,7 @@ ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -362,7 +362,7 @@ mcal_le_struct->flags = cl_flags; } if (mcal_stream == NULL) { - php3_error(E_WARNING,"Couldn't re-open stream\n"); + php_error(E_WARNING,"Couldn't re-open stream\n"); RETURN_FALSE; } RETURN_TRUE; @@ -389,7 +389,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -417,7 +417,7 @@ ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==3) { @@ -451,7 +451,7 @@ ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } make_event_object(return_value,mcal_le_struct->event); @@ -557,7 +557,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -617,7 +617,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -653,7 +653,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -690,7 +690,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -745,7 +745,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -780,7 +780,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if (cal_remove(mcal_le_struct->mcal_stream,uid->value.lval)) @@ -822,7 +822,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -859,7 +859,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -898,7 +898,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->category=strdup(category->value.str.val); @@ -926,7 +926,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->title=strdup(title->value.str.val); @@ -954,7 +954,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->description=strdup(description->value.str.val); @@ -988,7 +988,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -1030,7 +1030,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -1065,7 +1065,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->alarm=alarm->value.lval; @@ -1092,7 +1092,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } php3_event_init(mcal_le_struct); @@ -1127,7 +1127,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->public=class->value.lval; @@ -1326,37 +1326,37 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } - if(_php3_hash_find(next->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.year=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.mon=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.mday=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.hour=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.min=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.sec=(pvalue)->value.lval; @@ -1410,7 +1410,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1449,7 +1449,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1488,7 +1488,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1527,7 +1527,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1566,7 +1566,7 @@ mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); Index: php4/ext/mcal/php_mcal.h diff -u php4/ext/mcal/php_mcal.h:1.1 php4/ext/mcal/php_mcal.h:1.2 --- php4/ext/mcal/php_mcal.h:1.1 Sat Dec 4 14:15:54 1999 +++ php4/ext/mcal/php_mcal.h Fri Dec 17 15:55:09 1999 @@ -1,4 +1,4 @@ -/* $Id: php_mcal.h,v 1.1 1999/12/04 19:15:54 sas Exp $ */ +/* $Id: php_mcal.h,v 1.2 1999/12/17 20:55:09 zeev Exp $ */ #ifndef _INCLUDED_MCAL_H #define _INCLUDED_MCAL_H @@ -18,8 +18,8 @@ #endif /* Functions accessable to PHP */ -//extern php3_module_entry php3_mcal_module_entry; -extern php3_module_entry php3_mcal_module_entry; +//extern zend_module_entry php3_mcal_module_entry; +extern zend_module_entry php3_mcal_module_entry; #define php3_mcal_module_ptr &php3_mcal_module_entry #define phpext_mcal_ptr php3_mcal_module_ptr Index: php4/ext/mcrypt/php_mcrypt.h diff -u php4/ext/mcrypt/php_mcrypt.h:1.10 php4/ext/mcrypt/php_mcrypt.h:1.11 --- php4/ext/mcrypt/php_mcrypt.h:1.10 Thu May 6 16:54:56 1999 +++ php4/ext/mcrypt/php_mcrypt.h Fri Dec 17 15:55:10 1999 @@ -4,7 +4,7 @@ #if HAVE_LIBMCRYPT #if PHP_API_VERSION < 19990421 -#define zend_module_entry php3_module_entry +#define zend_module_entry zend_module_entry #include "modules.h" #include "internal_functions.h" #endif Index: php4/ext/mhash/php_mhash.h diff -u php4/ext/mhash/php_mhash.h:1.2 php4/ext/mhash/php_mhash.h:1.3 --- php4/ext/mhash/php_mhash.h:1.2 Fri May 21 16:09:23 1999 +++ php4/ext/mhash/php_mhash.h Fri Dec 17 15:55:12 1999 @@ -4,7 +4,7 @@ #if HAVE_LIBMHASH #if PHP_API_VERSION < 19990421 -#define zend_module_entry php3_module_entry +#define zend_module_entry zend_module_entry #include "modules.h" #include "internal_functions.h" #endif Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.45 php4/ext/oci8/oci8.c:1.46 --- php4/ext/oci8/oci8.c:1.45 Fri Dec 17 14:51:23 1999 +++ php4/ext/oci8/oci8.c Fri Dec 17 15:55:13 1999 @@ -22,7 +22,7 @@ #define OCI_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.45 1999/12/17 19:51:23 zeev Exp $ */ +/* $Id: oci8.c,v 1.46 1999/12/17 20:55:13 zeev Exp $ */ /* TODO list: * @@ -92,7 +92,7 @@ /* {{{ dynamically loadable module stuff */ #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &oci_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &oci_module_entry; }; #endif /* COMPILE_DL */ /* }}} */ @@ -259,7 +259,7 @@ {NULL,NULL,NULL} }; -php3_module_entry oci8_module_entry = { +zend_module_entry oci8_module_entry = { "Oracle-OCI8", /* extension name */ php_oci_functions, /* extension function list */ PHP_MINIT(oci), /* extension-wide startup function */ @@ -2441,7 +2441,7 @@ if (offparam == -1) { offset = curloblen; } else if (offparam >= curloblen) { - php3_error(E_WARNING, "Offset smaller than current LOB-Size - appending"); + php_error(E_WARNING, "Offset smaller than current LOB-Size - appending"); offset = curloblen; } else { offset = offparam; @@ -2455,7 +2455,7 @@ loblen = (*arg)->value.str.len; if (loblen < 1) { - php3_error(E_WARNING, "Cannot save a lob wich size is less than 1 byte"); + php_error(E_WARNING, "Cannot save a lob wich size is less than 1 byte"); RETURN_FALSE; } Index: php4/ext/oci8/php_oci8.h diff -u php4/ext/oci8/php_oci8.h:1.2 php4/ext/oci8/php_oci8.h:1.3 --- php4/ext/oci8/php_oci8.h:1.2 Thu Dec 9 06:02:40 1999 +++ php4/ext/oci8/php_oci8.h Fri Dec 17 15:55:13 1999 @@ -171,7 +171,7 @@ OCIEnv *pEnv; } php_oci_globals; -extern php3_module_entry oci8_module_entry; +extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry #define OCI_MAX_NAME_LEN 64 Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.16 php4/ext/odbc/php_odbc.c:1.17 --- php4/ext/odbc/php_odbc.c:1.16 Sat Dec 11 05:56:41 1999 +++ php4/ext/odbc/php_odbc.c Fri Dec 17 15:55:14 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.16 1999/12/11 10:56:41 kara Exp $ */ +/* $Id: php_odbc.c,v 1.17 1999/12/17 20:55:14 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -116,7 +116,7 @@ { NULL, NULL, NULL } }; -php3_module_entry odbc_module_entry = { +zend_module_entry odbc_module_entry = { "ODBC", odbc_functions, PHP_MINIT(odbc), @@ -279,7 +279,7 @@ if (atoi(value) <= 0) { PUTS("Passthru"); } else { - php3_printf("return up to %s bytes", value); + php_printf("return up to %s bytes", value); } } } Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.10 php4/ext/odbc/php_odbc.h:1.11 --- php4/ext/odbc/php_odbc.h:1.10 Sat Dec 11 05:56:42 1999 +++ php4/ext/odbc/php_odbc.h Fri Dec 17 15:55:14 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.10 1999/12/11 10:56:42 kara Exp $ */ +/* $Id: php_odbc.h,v 1.11 1999/12/17 20:55:14 zeev Exp $ */ #ifndef _PHP_ODBC_H #define _PHP_ODBC_H @@ -147,7 +147,7 @@ #include <sqlext.h> #endif -extern php3_module_entry odbc_module_entry; +extern zend_module_entry odbc_module_entry; #define odbc_module_ptr &odbc_module_entry Index: php4/ext/odbc/php_velocis.h diff -u php4/ext/odbc/php_velocis.h:1.1 php4/ext/odbc/php_velocis.h:1.2 --- php4/ext/odbc/php_velocis.h:1.1 Sat Dec 4 14:15:57 1999 +++ php4/ext/odbc/php_velocis.h Fri Dec 17 15:55:14 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_velocis.h,v 1.1 1999/12/04 19:15:57 sas Exp $ */ +/* $Id: php_velocis.h,v 1.2 1999/12/17 20:55:14 zeev Exp $ */ #ifndef _PHP_VELOCIS_H #define _PHP_VELOCIS_H @@ -70,7 +70,7 @@ int le_link,le_result; } velocis_module; -extern php3_module_entry velocis_module_entry; +extern zend_module_entry velocis_module_entry; #define velocis_module_ptr &velocis_module_entry /* velocis.c functions */ Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.10 php4/ext/odbc/velocis.c:1.11 --- php4/ext/odbc/velocis.c:1.10 Fri Dec 17 14:51:24 1999 +++ php4/ext/odbc/velocis.c Fri Dec 17 15:55:14 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.10 1999/12/17 19:51:24 zeev Exp $ */ +/* $Id: velocis.c,v 1.11 1999/12/17 20:55:14 zeev Exp $ */ /* * TODO: @@ -59,14 +59,14 @@ {NULL, NULL, NULL} }; -php3_module_entry velocis_module_entry = { +zend_module_entry velocis_module_entry = { "Velocis", velocis_functions, PHP_MINIT(velocis), PHP_MSHUTDOWN(velocis), PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -php3_module_entry *get_module() { return &velocis_module_entry; } +zend_module_entry *get_module() { return &velocis_module_entry; } #endif THREAD_LS velocis_module php3_velocis_module; Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.29 php4/ext/oracle/oracle.c:1.30 --- php4/ext/oracle/oracle.c:1.29 Thu Dec 9 06:02:41 1999 +++ php4/ext/oracle/oracle.c Fri Dec 17 15:55:16 1999 @@ -136,7 +136,7 @@ {NULL, NULL, NULL} }; -php3_module_entry oracle_module_entry = { +zend_module_entry oracle_module_entry = { "Oracle", oracle_functions, PHP_MINIT(oracle), /* extension-wide startup function */ @@ -183,7 +183,7 @@ }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &oracle_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &oracle_module_entry; }; #endif static int _close_oraconn(oraConnection *conn) Index: php4/ext/oracle/php_oracle.h diff -u php4/ext/oracle/php_oracle.h:1.2 php4/ext/oracle/php_oracle.h:1.3 --- php4/ext/oracle/php_oracle.h:1.2 Thu Dec 9 06:02:41 1999 +++ php4/ext/oracle/php_oracle.h Fri Dec 17 15:55:16 1999 @@ -1,4 +1,4 @@ -/* $Id: php_oracle.h,v 1.2 1999/12/09 11:02:41 thies Exp $ */ +/* $Id: php_oracle.h,v 1.3 1999/12/17 20:55:16 zeev Exp $ */ /* synced with oracle.h,v 1.40 1999/06/01 08:11:04 thies Exp $ */ @@ -25,7 +25,7 @@ #include "ociapr.h" #endif -extern php3_module_entry oracle_module_entry; +extern zend_module_entry oracle_module_entry; #define phpext_oracle_ptr &oracle_module_entry #ifdef ZTS Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.18 php4/ext/pdf/pdf.c:1.19 --- php4/ext/pdf/pdf.c:1.18 Fri Dec 17 14:51:25 1999 +++ php4/ext/pdf/pdf.c Fri Dec 17 15:55:17 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.18 1999/12/17 19:51:25 zeev Exp $ */ +/* $Id: pdf.c,v 1.19 1999/12/17 20:55:17 zeev Exp $ */ /* pdflib 2.01 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -159,13 +159,13 @@ {NULL, NULL, NULL} }; -php3_module_entry pdf_module_entry = { +zend_module_entry pdf_module_entry = { "pdf", pdf_functions, PHP_MINIT(pdf), PHP_MSHUTDOWN(pdf), NULL, NULL, PHP_MINFO(pdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &pdf_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &pdf_module_entry; } #endif static void _free_pdf_image(int image) @@ -193,11 +193,11 @@ PHP_MINFO_FUNCTION(pdf) { /* need to use a PHPAPI function here because it is external module in windows */ - php3_printf("pdflib %d.%02d<BR>", PDF_get_majorversion(), PDF_get_minorversion()); + php_printf("pdflib %d.%02d<BR>", PDF_get_majorversion(), PDF_get_minorversion()); #if PDFLIB_MINORVERSION > 0 - php3_printf("The function pdf_put_image() and pdf_execute_image() are <B>not</B> available"); + php_printf("The function pdf_put_image() and pdf_execute_image() are <B>not</B> available"); #else - php3_printf("The function pdf_put_image() and pdf_execute_image() are available"); + php_printf("The function pdf_put_image() and pdf_execute_image() are available"); #endif } @@ -224,7 +224,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -254,7 +254,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -284,7 +284,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -314,7 +314,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -344,7 +344,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -397,7 +397,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -428,7 +428,7 @@ width = arg3->value.dval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -454,7 +454,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -481,7 +481,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -510,7 +510,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -553,12 +553,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg4->value.lval > 5) || (arg4->value.lval < 0)) { - php3_error(E_WARNING,"Font encoding set to 4"); + php_error(E_WARNING,"Font encoding set to 4"); arg4->value.lval = 4; } @@ -579,12 +579,12 @@ font = PDF_findfont(pdf, arg2->value.str.val, "winansi", embed); break; default: - php3_error(E_WARNING,"Encoding out of range, using 0"); + php_error(E_WARNING,"Encoding out of range, using 0"); font = PDF_findfont(pdf, arg2->value.str.val, "builtin", embed); } if (font < 0) { - php3_error(E_WARNING,"Font %s not found", arg2->value.str.val); + php_error(E_WARNING,"Font %s not found", arg2->value.str.val); RETURN_FALSE; } @@ -610,7 +610,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -637,7 +637,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -664,7 +664,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -691,7 +691,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -718,7 +718,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -745,7 +745,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -772,7 +772,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -803,19 +803,19 @@ matrix=arg2->value.ht; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } - if(_php3_hash_num_elements(matrix) != 6) { - php3_error(E_WARNING,"Text matrix must have 6 elements"); + if(zend_hash_num_elements(matrix) != 6) { + php_error(E_WARNING,"Text matrix must have 6 elements"); RETURN_FALSE; } pdfmatrixptr = (float *) &pdfmatrix; - _php3_hash_internal_pointer_reset(matrix); - for(i=0; i<_php3_hash_num_elements(matrix); i++) { - _php3_hash_get_current_data(matrix, (void *) &data); + zend_hash_internal_pointer_reset(matrix); + for(i=0; i<zend_hash_num_elements(matrix); i++) { + zend_hash_get_current_data(matrix, (void *) &data); switch(data->type) { case IS_DOUBLE: *pdfmatrixptr++ = (float) data->value.dval; @@ -824,7 +824,7 @@ *pdfmatrixptr++ = 0.0; break; } - _php3_hash_move_forward(matrix); + zend_hash_move_forward(matrix); } PDF_set_text_matrix(pdf, pdfmatrix[0], pdfmatrix[1], pdfmatrix[2], @@ -852,7 +852,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -879,7 +879,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -906,7 +906,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -933,7 +933,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -961,7 +961,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -987,7 +987,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1013,7 +1013,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1041,7 +1041,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1069,7 +1069,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1096,7 +1096,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1123,12 +1123,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 100) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); + php_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); RETURN_FALSE; } @@ -1155,12 +1155,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); + php_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); RETURN_FALSE; } @@ -1187,12 +1187,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); + php_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); RETURN_FALSE; } @@ -1219,12 +1219,12 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if(arg2->value.dval < 1) { - php3_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); + php_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); RETURN_FALSE; } @@ -1251,7 +1251,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1279,7 +1279,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1307,7 +1307,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1339,7 +1339,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1372,7 +1372,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1401,7 +1401,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1432,7 +1432,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1462,7 +1462,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1491,7 +1491,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1517,7 +1517,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1543,7 +1543,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1569,7 +1569,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1595,7 +1595,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1621,7 +1621,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1647,7 +1647,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1673,7 +1673,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1700,7 +1700,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1727,7 +1727,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1754,7 +1754,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1783,7 +1783,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1812,7 +1812,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1841,7 +1841,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1885,7 +1885,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find document identifier %d",id); + php_error(E_WARNING,"Unable to find document identifier %d",id); RETURN_FALSE; } @@ -1896,7 +1896,7 @@ if (id > 0) { parent = zend_list_find(id, &type); if (!parent || (type != PDF_GLOBAL(le_outline))) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } else { parentid = *parent; @@ -1940,7 +1940,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1995,7 +1995,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2023,14 +2023,14 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } pdf_image = PDF_open_GIF(pdf, arg2->value.str.val); if(pdf_image < 0) { - php3_error(E_WARNING, "Could not open image"); + php_error(E_WARNING, "Could not open image"); RETURN_FALSE; } @@ -2057,14 +2057,14 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } pdf_image = PDF_open_JPEG(pdf, arg2->value.str.val); if(pdf_image < 0) { - php3_error(E_WARNING, "Could not open image"); + php_error(E_WARNING, "Could not open image"); RETURN_FALSE; } @@ -2094,7 +2094,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2102,7 +2102,7 @@ gid=argv[1]->value.lval; im = zend_list_find(gid, &type); if (!im || type != phpi_get_le_gd()) { - php3_error(E_WARNING, "pdf: Unable to find image pointer"); + php_error(E_WARNING, "pdf: Unable to find image pointer"); RETURN_FALSE; } @@ -2129,7 +2129,7 @@ efree(buffer); if(-1 == pdf_image) { - php3_error(E_WARNING, "Could not open image"); + php_error(E_WARNING, "Could not open image"); efree(buffer); RETURN_FALSE; } @@ -2157,7 +2157,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2165,7 +2165,7 @@ id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2192,7 +2192,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2200,7 +2200,7 @@ id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2234,7 +2234,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2242,7 +2242,7 @@ id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2273,7 +2273,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2281,7 +2281,7 @@ id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2313,7 +2313,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2321,7 +2321,7 @@ id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2349,7 +2349,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2357,7 +2357,7 @@ id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2388,7 +2388,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2421,7 +2421,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2449,7 +2449,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2478,7 +2478,7 @@ id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2512,7 +2512,7 @@ id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } Index: php4/ext/pdf/php_pdf.h diff -u php4/ext/pdf/php_pdf.h:1.1 php4/ext/pdf/php_pdf.h:1.2 --- php4/ext/pdf/php_pdf.h:1.1 Sat Dec 4 14:16:00 1999 +++ php4/ext/pdf/php_pdf.h Fri Dec 17 15:55:17 1999 @@ -26,7 +26,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_pdf.h,v 1.1 1999/12/04 19:16:00 sas Exp $ */ +/* $Id: php_pdf.h,v 1.2 1999/12/17 20:55:17 zeev Exp $ */ #ifndef _PHP_PDF_H #define _PHP_PDF_H @@ -37,7 +37,7 @@ extern int le_fp; -extern php3_module_entry pdf_module_entry; +extern zend_module_entry pdf_module_entry; #define pdf_module_ptr &pdf_module_entry extern PHP_MINFO_FUNCTION(pdf); Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.30 php4/ext/pgsql/pgsql.c:1.31 --- php4/ext/pgsql/pgsql.c:1.30 Fri Dec 17 14:51:27 1999 +++ php4/ext/pgsql/pgsql.c Fri Dec 17 15:55:18 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.30 1999/12/17 19:51:27 zeev Exp $ */ +/* $Id: pgsql.c,v 1.31 1999/12/17 20:55:18 zeev Exp $ */ #include <stdlib.h> @@ -74,12 +74,12 @@ {NULL, NULL, NULL} }; -php3_module_entry pgsql_module_entry = { +zend_module_entry pgsql_module_entry = { "PostgreSQL", pgsql_functions, php3_minit_pgsql, NULL, php3_rinit_pgsql, NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -PHP_PGSQL_API php3_module_entry *get_module() { return &pgsql_module_entry; } +PHP_PGSQL_API zend_module_entry *get_module() { return &pgsql_module_entry; } #endif static int le_link,le_plink,le_result,le_lofp,le_string; Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.1 php4/ext/pgsql/php_pgsql.h:1.2 --- php4/ext/pgsql/php_pgsql.h:1.1 Sat Dec 4 14:16:00 1999 +++ php4/ext/pgsql/php_pgsql.h Fri Dec 17 15:55:18 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.1 1999/12/04 19:16:00 sas Exp $ */ +/* $Id: php_pgsql.h,v 1.2 1999/12/17 20:55:18 zeev Exp $ */ #ifndef _PHP_PGSQL_H #define _PHP_PGSQL_H @@ -39,7 +39,7 @@ #if HAVE_PGSQL -extern php3_module_entry pgsql_module_entry; +extern zend_module_entry pgsql_module_entry; #define pgsql_module_ptr &pgsql_module_entry Index: php4/ext/posix/php_posix.h diff -u php4/ext/posix/php_posix.h:1.1 php4/ext/posix/php_posix.h:1.2 --- php4/ext/posix/php_posix.h:1.1 Sat Dec 4 14:16:01 1999 +++ php4/ext/posix/php_posix.h Fri Dec 17 15:55:19 1999 @@ -28,7 +28,7 @@ */ -/* $Id: php_posix.h,v 1.1 1999/12/04 19:16:01 sas Exp $ */ +/* $Id: php_posix.h,v 1.2 1999/12/17 20:55:19 zeev Exp $ */ #ifndef _PHP_POSIX_H #define _PHP_POSIX_H @@ -42,7 +42,7 @@ #define DLEXPORT #endif -extern php3_module_entry posix_module_entry; +extern zend_module_entry posix_module_entry; #define posix_module_ptr &posix_module_entry PHP_FUNCTION(posix_kill); Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.3 php4/ext/posix/posix.c:1.4 --- php4/ext/posix/posix.c:1.3 Fri Dec 17 14:16:46 1999 +++ php4/ext/posix/posix.c Fri Dec 17 15:55:19 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.3 1999/12/17 19:16:46 zeev Exp $ */ +/* $Id: posix.c,v 1.4 1999/12/17 20:55:19 zeev Exp $ */ #include "php.h" @@ -117,7 +117,7 @@ static PHP_MINFO_FUNCTION(posix); -php3_module_entry posix_module_entry = { +zend_module_entry posix_module_entry = { "Posix", posix_functions, NULL, @@ -129,7 +129,7 @@ }; #ifdef COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &posix__module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &posix__module_entry; } #endif #if APACHE @@ -138,7 +138,7 @@ static PHP_MINFO_FUNCTION(posix) { - PUTS("$Revision: 1.3 $\n"); + PUTS("$Revision: 1.4 $\n"); } /* {{{ proto int posix_kill(int pid, int sig) @@ -159,7 +159,7 @@ result = kill(pid->value.lval, sig->value.lval); if (result< 0) { - php3_error(E_WARNING, "posix_kill(%d, %d) failed with '%s'", + php_error(E_WARNING, "posix_kill(%d, %d) failed with '%s'", pid->value.lval, sig->value.lval, strerror(errno)); @@ -251,7 +251,7 @@ result = setuid(uid->value.lval); if (result < 0) { - php3_error(E_WARNING, "posix_setuid(%d) failed with '%s'. Must be root", + php_error(E_WARNING, "posix_setuid(%d) failed with '%s'. Must be root", uid->value.lval, strerror(errno)); RETURN_FALSE; @@ -276,7 +276,7 @@ result = setgid(gid->value.lval); if (result < 0) { - php3_error(E_WARNING, "posix_setgid(%d) failed with '%s'. Must be root", + php_error(E_WARNING, "posix_setgid(%d) failed with '%s'. Must be root", gid->value.lval, strerror(errno)); RETURN_FALSE; @@ -296,7 +296,7 @@ result = getgroups(NGROUPS_MAX, gidlist); if (result < 0) { - php3_error(E_WARNING, "posix_getgroups() failed with '%s'", + php_error(E_WARNING, "posix_getgroups() failed with '%s'", strerror(errno)); RETURN_FALSE; } @@ -319,7 +319,7 @@ p = getlogin(); if (p == NULL) { - php3_error(E_WARNING, "Cannot determine your login name. Something is really wrong here."); + php_error(E_WARNING, "Cannot determine your login name. Something is really wrong here."); RETURN_FALSE; } @@ -370,7 +370,7 @@ result = setpgid(pid->value.lval, pgid->value.lval); if (result< 0) { - php3_error(E_WARNING, "posix_setpgid(%d, %d) failed with '%s'", + php_error(E_WARNING, "posix_setpgid(%d, %d) failed with '%s'", pid->value.lval, pgid->value.lval, strerror(errno)); @@ -396,7 +396,7 @@ convert_to_long(pid); pgid = getpgid(pid->value.lval); if (pgid < 0) { - php3_error(E_WARNING, "posix_getpgid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getpgid(%d) failed with '%s'", pid->value.lval, strerror(errno)); RETURN_FALSE; @@ -425,7 +425,7 @@ convert_to_long(pid); sid = getsid(pid->value.lval); if (sid < 0) { - php3_error(E_WARNING, "posix_getsid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getsid(%d) failed with '%s'", pid->value.lval, strerror(errno)); RETURN_FALSE; @@ -471,7 +471,7 @@ ticks = times(&t); if (ticks < 0) { - php3_error(E_WARNING, "posix_times failed with '%s'", + php_error(E_WARNING, "posix_times failed with '%s'", strerror(errno)); } @@ -500,7 +500,7 @@ p = ctermid(buffer); if (p == NULL) { - php3_error(E_WARNING, "posix_ctermid() failed with '%s'", + php_error(E_WARNING, "posix_ctermid() failed with '%s'", strerror(errno)); RETURN_FALSE; } @@ -526,7 +526,7 @@ p = ttyname(fd->value.lval); if (p == NULL) { - php3_error(E_WARNING, "posix_ttyname(%d) failed with '%s'", + php_error(E_WARNING, "posix_ttyname(%d) failed with '%s'", fd->value.lval, strerror(errno)); RETURN_FALSE; @@ -574,7 +574,7 @@ p = getcwd(buffer, MAXPATHLEN); if (!p) { - php3_error(E_WARNING, "posix_getcwd() failed with '%s'", + php_error(E_WARNING, "posix_getcwd() failed with '%s'", strerror(errno)); RETURN_FALSE; } @@ -609,7 +609,7 @@ } result = mkfifo(path->value.str.val, mode->value.lval); if (result < 0) { - php3_error(E_WARNING, "posix_mkfifo(%s) failed with '%s'", + php_error(E_WARNING, "posix_mkfifo(%s) failed with '%s'", path->value.str.val, strerror(errno)); RETURN_FALSE; @@ -652,7 +652,7 @@ g = getgrnam(name->value.str.val); if (!g) { - php3_error(E_WARNING, "posix_getgrnam(%s) failed with '%s'", + php_error(E_WARNING, "posix_getgrnam(%s) failed with '%s'", name->value.str.val, strerror(errno)); RETURN_FALSE; @@ -688,7 +688,7 @@ g = getgrgid(gid->value.lval); if (!g) { - php3_error(E_WARNING, "posix_getgrgid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getgrgid(%d) failed with '%s'", gid->value.lval, strerror(errno)); RETURN_FALSE; @@ -720,7 +720,7 @@ pw = getpwnam(name->value.str.val); if (!pw) { - php3_error(E_WARNING, "posix_getpwnam(%s) failed with '%s'", + php_error(E_WARNING, "posix_getpwnam(%s) failed with '%s'", name->value.str.val, strerror(errno)); RETURN_FALSE; @@ -752,7 +752,7 @@ pw = getpwuid(uid->value.lval); if (!pw) { - php3_error(E_WARNING, "posix_getpwuid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getpwuid(%d) failed with '%s'", uid->value.lval, strerror(errno)); RETURN_FALSE; @@ -783,7 +783,7 @@ result = getrlimit(limit, &rl); if (result < 0) { - php3_error(E_WARNING, "posix_getrlimit failed to getrlimit(RLIMIT_CORE with '%s'", strerror(errno)); + php_error(E_WARNING, "posix_getrlimit failed to getrlimit(RLIMIT_CORE with '%s'", strerror(errno)); return FAILURE; } Index: php4/ext/snmp/php_snmp.h diff -u php4/ext/snmp/php_snmp.h:1.1 php4/ext/snmp/php_snmp.h:1.2 --- php4/ext/snmp/php_snmp.h:1.1 Sat Dec 4 14:16:02 1999 +++ php4/ext/snmp/php_snmp.h Fri Dec 17 15:55:20 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_snmp.h,v 1.1 1999/12/04 19:16:02 sas Exp $ */ +/* $Id: php_snmp.h,v 1.2 1999/12/17 20:55:20 zeev Exp $ */ #ifndef _PHP_SNMP_H #define _PHP_SNMP_H @@ -31,7 +31,7 @@ #define DLEXPORT #endif -extern php3_module_entry snmp_module_entry; +extern zend_module_entry snmp_module_entry; #define snmp_module_ptr &snmp_module_entry extern int php3i_snmp_init(INIT_FUNC_ARGS); Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.13 php4/ext/snmp/snmp.c:1.14 --- php4/ext/snmp/snmp.c:1.13 Sun Dec 12 06:02:07 1999 +++ php4/ext/snmp/snmp.c Fri Dec 17 15:55:22 1999 @@ -17,7 +17,7 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.13 1999/12/12 11:02:07 sas Exp $ */ +/* $Id: snmp.c,v 1.14 1999/12/17 20:55:22 zeev Exp $ */ #include "php.h" #if defined(COMPILE_DL) @@ -84,12 +84,12 @@ {NULL,NULL,NULL} }; -php3_module_entry snmp_module_entry = { +zend_module_entry snmp_module_entry = { "SNMP",snmp_functions,php3i_snmp_init,NULL,NULL,NULL,php3_info_snmp,STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &snmp_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; }; #endif /* THREAD_LS snmp_module php3_snmp_module; - may need one of these at some point */ Index: php4/ext/standard/base64.c diff -u php4/ext/standard/base64.c:1.10 php4/ext/standard/base64.c:1.11 --- php4/ext/standard/base64.c:1.10 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/base64.c Fri Dec 17 15:55:24 1999 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.c,v 1.10 1999/12/17 19:51:29 zeev Exp $ */ +/* $Id: base64.c,v 1.11 1999/12/17 20:55:24 zeev Exp $ */ #include <string.h> @@ -68,7 +68,7 @@ } /* as above, but backwards. :) */ -unsigned char *_php3_base64_decode(const unsigned char *string, int length, int *ret_length) { +unsigned char *php_base64_decode(const unsigned char *string, int length, int *ret_length) { const unsigned char *current = string; int ch, i = 0, j = 0, k; /* this sucks for threaded environments */ @@ -173,7 +173,7 @@ WRONG_PARAM_COUNT; } convert_to_string_ex(string); - result = _php3_base64_decode((*string)->value.str.val, (*string)->value.str.len, &ret_length); + result = php_base64_decode((*string)->value.str.val, (*string)->value.str.len, &ret_length); if (result != NULL) { return_value->value.str.val = result; return_value->value.str.len = ret_length; Index: php4/ext/standard/base64.h diff -u php4/ext/standard/base64.h:1.3 php4/ext/standard/base64.h:1.4 --- php4/ext/standard/base64.h:1.3 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/base64.h Fri Dec 17 15:55:24 1999 @@ -26,7 +26,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.h,v 1.3 1999/12/17 19:51:29 zeev Exp $ */ +/* $Id: base64.h,v 1.4 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _BASE64_h #define _BASE64_h @@ -35,7 +35,7 @@ PHP_FUNCTION(base64_encode); extern unsigned char *php_base64_encode(const unsigned char *, int, int *); -extern unsigned char *_php3_base64_decode(const unsigned char *, int, int *); +extern unsigned char *php_base64_decode(const unsigned char *, int, int *); #endif /* _BASE64_h */ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.138 php4/ext/standard/basic_functions.c:1.139 --- php4/ext/standard/basic_functions.c:1.138 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/basic_functions.c Fri Dec 17 15:55:24 1999 @@ -323,7 +323,7 @@ PHP_INI_END() -php3_module_entry basic_functions_module = { +zend_module_entry basic_functions_module = { "Basic Functions", /* extension name */ basic_functions, /* function list */ PHP_MINIT(basic), /* process startup */ @@ -810,7 +810,7 @@ } -void php3_is_type(INTERNAL_FUNCTION_PARAMETERS,int type) +void php_is_type(INTERNAL_FUNCTION_PARAMETERS,int type) { pval **arg; @@ -827,37 +827,37 @@ PHP_FUNCTION(is_resource) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE); } PHP_FUNCTION(is_bool) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL); } PHP_FUNCTION(is_long) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); } PHP_FUNCTION(is_double) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); } PHP_FUNCTION(is_string) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); } PHP_FUNCTION(is_array) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); } PHP_FUNCTION(is_object) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); } Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.37 php4/ext/standard/basic_functions.h:1.38 --- php4/ext/standard/basic_functions.h:1.37 Thu Dec 16 18:47:10 1999 +++ php4/ext/standard/basic_functions.h Fri Dec 17 15:55:24 1999 @@ -29,7 +29,7 @@ */ -/* $Id: basic_functions.h,v 1.37 1999/12/16 23:47:10 andrei Exp $ */ +/* $Id: basic_functions.h,v 1.38 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _BASIC_FUNCTIONS_H #define _BASIC_FUNCTIONS_H @@ -38,7 +38,7 @@ #include "zend_highlight.h" -extern php3_module_entry basic_functions_module; +extern zend_module_entry basic_functions_module; #define basic_functions_module_ptr &basic_functions_module PHP_MINIT_FUNCTION(basic); @@ -68,7 +68,7 @@ PHP_FUNCTION(get_magic_quotes_runtime); PHP_FUNCTION(get_magic_quotes_gpc); -void php3_is_type(INTERNAL_FUNCTION_PARAMETERS, int type); +void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type); PHP_FUNCTION(is_resource); PHP_FUNCTION(is_bool); PHP_FUNCTION(is_long); Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.15 php4/ext/standard/browscap.c:1.16 --- php4/ext/standard/browscap.c:1.15 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/browscap.c Fri Dec 17 15:55:24 1999 @@ -33,7 +33,7 @@ {NULL, NULL, NULL} }; -php3_module_entry browscap_module_entry = { +zend_module_entry browscap_module_entry = { "browscap", browscap_functions, PHP_MINIT(browscap), PHP_MSHUTDOWN(browscap), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/crypt.c diff -u php4/ext/standard/crypt.c:1.11 php4/ext/standard/crypt.c:1.12 --- php4/ext/standard/crypt.c:1.11 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/crypt.c Fri Dec 17 15:55:24 1999 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.11 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: crypt.c,v 1.12 1999/12/17 20:55:24 zeev Exp $ */ #include <stdlib.h> #include "php.h" @@ -53,7 +53,7 @@ {NULL, NULL, NULL} }; -php3_module_entry crypt_module_entry = { +zend_module_entry crypt_module_entry = { "Crypt", crypt_functions, PHP_MINIT(crypt), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.20 php4/ext/standard/dir.c:1.21 --- php4/ext/standard/dir.c:1.20 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/dir.c Fri Dec 17 15:55:24 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.20 1999/12/17 19:51:29 zeev Exp $ */ +/* $Id: dir.c,v 1.21 1999/12/17 20:55:24 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -102,7 +102,7 @@ }; -php3_module_entry php3_dir_module_entry = { +zend_module_entry php3_dir_module_entry = { "PHP_dir", php_dir_functions, PHP_MINIT(dir), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.16 php4/ext/standard/dl.c:1.17 --- php4/ext/standard/dl.c:1.16 Sat Dec 4 15:55:33 1999 +++ php4/ext/standard/dl.c Fri Dec 17 15:55:24 1999 @@ -46,7 +46,7 @@ }; -php3_module_entry dl_module_entry = { +zend_module_entry dl_module_entry = { "PHP_DL", dl_functions, NULL, NULL, NULL, NULL, PHP_MINFO(dl), STANDARD_MODULE_PROPERTIES }; @@ -84,8 +84,8 @@ { void *handle; char libpath[MAXPATHLEN + 1]; - php3_module_entry *module_entry,*tmp; - php3_module_entry *(*get_module)(void); + zend_module_entry *module_entry,*tmp; + zend_module_entry *(*get_module)(void); PLS_FETCH(); if (cfg_get_string("extension_dir",&PG(extension_dir))==SUCCESS @@ -119,7 +119,7 @@ #endif RETURN_FALSE; } - get_module = (php3_module_entry *(*)(void)) dlsym(handle, "get_module"); + get_module = (zend_module_entry *(*)(void)) dlsym(handle, "get_module"); if (!get_module) { dlclose(handle); Index: php4/ext/standard/dl.h diff -u php4/ext/standard/dl.h:1.7 php4/ext/standard/dl.h:1.8 --- php4/ext/standard/dl.h:1.7 Sat Dec 4 15:55:33 1999 +++ php4/ext/standard/dl.h Fri Dec 17 15:55:24 1999 @@ -30,7 +30,7 @@ */ -/* $Id: dl.h,v 1.7 1999/12/04 20:55:33 ssb Exp $ */ +/* $Id: dl.h,v 1.8 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _DL_H #define _DL_H @@ -40,7 +40,7 @@ #ifdef HAVE_LIBDL -extern php3_module_entry dl_module_entry; +extern zend_module_entry dl_module_entry; #define dl_module_ptr &dl_module_entry /* dynamic loading functions */ Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.49 php4/ext/standard/file.c:1.50 --- php4/ext/standard/file.c:1.49 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/file.c Fri Dec 17 15:55:24 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.49 1999/12/17 19:51:29 zeev Exp $ */ +/* $Id: file.c,v 1.50 1999/12/17 20:55:24 zeev Exp $ */ /* Synced with php3 revision 1.218 1999-06-16 [ssb] */ @@ -865,7 +865,7 @@ if (_php3_set_sock_blocking(socketd, block) == FAILURE) RETURN_FALSE; - _php3_sock_set_blocking(socketd, block == 0 ? 0 : 1); + php_sockset_blocking(socketd, block == 0 ? 0 : 1); RETURN_TRUE; } Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.16 php4/ext/standard/filestat.c:1.17 --- php4/ext/standard/filestat.c:1.16 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/filestat.c Fri Dec 17 15:55:24 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.16 1999/12/17 19:16:47 zeev Exp $ */ +/* $Id: filestat.c,v 1.17 1999/12/17 20:55:24 zeev Exp $ */ #include "php.h" #include "safe_mode.h" @@ -173,7 +173,7 @@ } } else { - php3_error(E_WARNING, "Unable to load kernel32.dll"); + php_error(E_WARNING, "Unable to load kernel32.dll"); RETURN_FALSE; } @@ -591,7 +591,7 @@ }; -php3_module_entry php3_filestat_module_entry = { +zend_module_entry php3_filestat_module_entry = { "PHP_filestat", php3_filestat_functions, NULL, NULL, PHP_RINIT(filestat), PHP_RSHUTDOWN(filestat), NULL, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.11 php4/ext/standard/formatted_print.c:1.12 --- php4/ext/standard/formatted_print.c:1.11 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/formatted_print.c Fri Dec 17 15:55:24 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.11 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: formatted_print.c,v 1.12 1999/12/17 20:55:24 zeev Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -365,7 +365,7 @@ * */ static char * -php3_formatted_print(int ht, int *len) +php_formatted_print(int ht, int *len) { pval ***args; int argc, size = 240, inpos = 0, outpos = 0; @@ -561,7 +561,7 @@ char *result; int len; - if ((result=php3_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht,&len))==NULL) { RETURN_FALSE; } RETVAL_STRINGL(result,len,1); @@ -576,7 +576,7 @@ char *result; int len; - if ((result=php3_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht,&len))==NULL) { RETURN_FALSE; } PHPWRITE(result,len); Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.32 php4/ext/standard/fsock.c:1.33 --- php4/ext/standard/fsock.c:1.32 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/fsock.c Fri Dec 17 15:55:24 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.32 1999/12/17 19:51:29 zeev Exp $ */ +/* $Id: fsock.c,v 1.33 1999/12/17 20:55:24 zeev Exp $ */ /* Synced with php3 revision 1.121 1999-06-18 [ssb] */ /* Synced with php3 revision 1.133 1999-07-21 [sas] */ @@ -111,7 +111,7 @@ typedef struct php3i_sockbuf php3i_sockbuf; -php3_module_entry fsock_module_entry = { +zend_module_entry fsock_module_entry = { "Socket functions", fsock_functions, PHP_MINIT(fsock), @@ -411,10 +411,10 @@ #define SOCK_FIND(sock,socket) \ php3i_sockbuf *sock; \ FLS_FETCH(); \ - sock = _php3_sock_find(socket FLS_CC); \ - if(!sock) sock = _php3_sock_create(socket FLS_CC) + sock = php_sockfind(socket FLS_CC); \ + if(!sock) sock = php_sockcreate(socket FLS_CC) -static php3i_sockbuf *_php3_sock_find(int socket FLS_DC) +static php3i_sockbuf *php_sockfind(int socket FLS_DC) { php3i_sockbuf *buf = NULL, *tmp; @@ -427,7 +427,7 @@ return buf; } -static php3i_sockbuf *_php3_sock_create(int socket FLS_DC) +static php3i_sockbuf *php_sockcreate(int socket FLS_DC) { php3i_sockbuf *sock; int persistent = _php3_is_persistent_sock(socket); @@ -457,13 +457,13 @@ return old; } -int _php3_sock_destroy(int socket) +int php_sockdestroy(int socket) { int ret = 0; php3i_sockbuf *sock; FLS_FETCH(); - sock = _php3_sock_find(socket FLS_CC); + sock = php_sockfind(socket FLS_CC); if(sock) { ret = 1; SOCK_DESTROY(sock); @@ -490,7 +490,7 @@ php3i_sockbuf *sock; FLS_FETCH(); - sock = _php3_sock_find(socket FLS_CC); + sock = php_sockfind(socket FLS_CC); if(sock) { if(!sock->persistent) { SOCK_CLOSE(sock->socket); @@ -505,7 +505,7 @@ #define MAX_CHUNKS_PER_READ 10 -static void _php3_sock_wait_for_data(php3i_sockbuf *sock) +static void php_sockwait_for_data(php3i_sockbuf *sock) { fd_set fdr, tfdr; @@ -519,7 +519,7 @@ } } -static size_t _php3_sock_read_internal(php3i_sockbuf *sock) +static size_t php_sockread_internal(php3i_sockbuf *sock) { char buf[CHUNK_SIZE]; int nr_bytes; @@ -534,7 +534,7 @@ if(sock->is_blocked) { - _php3_sock_wait_for_data(sock); + php_sockwait_for_data(sock); } /* read at a maximum sock->chunk_size */ @@ -555,21 +555,21 @@ return nr_read; } -static void _php3_sock_read_total(php3i_sockbuf *sock, size_t maxread) +static void php_sockread_total(php3i_sockbuf *sock, size_t maxread) { while(!sock->eof && TOREAD(sock) < maxread) { - _php3_sock_read_internal(sock); + php_sockread_internal(sock); } } -static size_t _php3_sock_read(php3i_sockbuf *sock) +static size_t php_sockread(php3i_sockbuf *sock) { size_t nr_bytes; size_t nr_read = 0; int i; for(i = 0; !sock->eof && i < MAX_CHUNKS_PER_READ; i++) { - nr_bytes = _php3_sock_read_internal(sock); + nr_bytes = php_sockread_internal(sock); if(nr_bytes == 0) break; nr_read += nr_bytes; } @@ -577,7 +577,7 @@ return nr_read; } -int _php3_sock_set_blocking(int socket, int mode) +int php_sockset_blocking(int socket, int mode) { int old; SOCK_FIND(sock, socket); @@ -591,7 +591,7 @@ #define SOCK_FIND_AND_READ_MAX(max) \ SOCK_FIND(sock, socket); \ - if(sock->is_blocked) _php3_sock_read_total(sock, max); else _php3_sock_read(sock) + if(sock->is_blocked) php_sockread_total(sock, max); else php_sockread(sock) /* {{{ php_sock_fgets() */ /* @@ -614,11 +614,11 @@ if(!p) { if(sock->is_blocked) { while(!p && !sock->eof && TOREAD(sock) < maxlen) { - _php3_sock_read_internal(sock); + php_sockread_internal(sock); SEARCHCR(); } } else { - _php3_sock_read(sock); + php_sockread(sock); SEARCHCR(); } } @@ -674,7 +674,7 @@ SOCK_FIND(sock, socket); if(!sock->is_blocked) - _php3_sock_read(sock); + php_sockread(sock); if(!TOREAD(sock) && sock->eof) ret = 1; Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.19 php4/ext/standard/fsock.h:1.20 --- php4/ext/standard/fsock.h:1.19 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/fsock.h Fri Dec 17 15:55:24 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.19 1999/12/17 19:51:29 zeev Exp $ */ +/* $Id: fsock.h,v 1.20 1999/12/17 20:55:24 zeev Exp $ */ /* Synced with php3 revision 1.24 1999-06-18 [ssb] */ @@ -55,7 +55,7 @@ #include <sys/time.h> #endif -extern php3_module_entry fsock_module_entry; +extern zend_module_entry fsock_module_entry; #define phpext_fsock_ptr &fsock_module_entry PHP_FUNCTION(fsockopen); @@ -66,8 +66,8 @@ int php_sock_feof(int socket); int php_sock_fgetc(int socket); int _php3_is_persistent_sock(int); -int _php3_sock_set_blocking(int socket, int mode); -int _php3_sock_destroy(int socket); +int php_sockset_blocking(int socket, int mode); +int php_sockdestroy(int socket); int php_sock_close(int socket); size_t php_sock_set_def_chunk_size(size_t size); int php_msock_destroy(int *data); Index: php4/ext/standard/head.c diff -u php4/ext/standard/head.c:1.20 php4/ext/standard/head.c:1.21 --- php4/ext/standard/head.c:1.20 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/head.c Fri Dec 17 15:55:24 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.20 1999/12/17 19:51:29 zeev Exp $ */ +/* $Id: head.c,v 1.21 1999/12/17 20:55:24 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -573,7 +573,7 @@ }; -php3_module_entry php_header_module_entry = { +zend_module_entry php_header_module_entry = { "PHP_head", php_header_functions, NULL, NULL, PHP_RINIT(head), NULL, NULL, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/head.h diff -u php4/ext/standard/head.h:1.10 php4/ext/standard/head.h:1.11 --- php4/ext/standard/head.h:1.10 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/head.h Fri Dec 17 15:55:24 1999 @@ -49,7 +49,7 @@ struct CookieList *next; } CookieList; -extern php3_module_entry php_header_module_entry; +extern zend_module_entry php_header_module_entry; #define php_header_module_ptr &php_header_module_entry extern PHP_RINIT_FUNCTION(head); Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.11 php4/ext/standard/mail.c:1.12 --- php4/ext/standard/mail.c:1.11 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/mail.c Fri Dec 17 15:55:24 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.11 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: mail.c,v 1.12 1999/12/17 20:55:24 zeev Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -44,13 +44,13 @@ {NULL, NULL, NULL} }; -php3_module_entry mail_module_entry = { +zend_module_entry mail_module_entry = { "Sendmail", mail_functions, NULL, NULL, NULL, NULL, PHP_MINFO(mail), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &odbc_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &odbc_module_entry; } #endif /* {{{ proto int mail(string to, string subject, string message [, string additional_headers]) Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.8 php4/ext/standard/output.c:1.9 --- php4/ext/standard/output.c:1.8 Fri Dec 17 14:51:29 1999 +++ php4/ext/standard/output.c Fri Dec 17 15:55:24 1999 @@ -107,7 +107,7 @@ PHP_RINIT_FUNCTION(output); PHP_RSHUTDOWN_FUNCTION(output); -php3_module_entry output_module_entry = { +zend_module_entry output_module_entry = { "PHP_output", php_output_functions, NULL, /* extension-wide startup function */ Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.10 php4/ext/standard/pack.c:1.11 --- php4/ext/standard/pack.c:1.10 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/pack.c Fri Dec 17 15:55:24 1999 @@ -15,7 +15,7 @@ | Authors: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.10 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: pack.c,v 1.11 1999/12/17 20:55:24 zeev Exp $ */ #include "php.h" @@ -56,7 +56,7 @@ {NULL, NULL, NULL} }; -php3_module_entry pack_module_entry = { +zend_module_entry pack_module_entry = { "PHP_pack", pack_functions, PHP_MINIT(pack), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; Index: php4/ext/standard/pack.h diff -u php4/ext/standard/pack.h:1.4 php4/ext/standard/pack.h:1.5 --- php4/ext/standard/pack.h:1.4 Mon Jul 26 16:09:08 1999 +++ php4/ext/standard/pack.h Fri Dec 17 15:55:24 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: pack.h,v 1.4 1999/07/26 20:09:08 andrey Exp $ */ +/* $Id: pack.h,v 1.5 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _PACK_H #define _PACK_H -extern php3_module_entry pack_module_entry; +extern zend_module_entry pack_module_entry; #define pack_module_ptr &pack_module_entry extern PHP_MINIT_FUNCTION(pack); Index: php4/ext/standard/php_browscap.h diff -u php4/ext/standard/php_browscap.h:1.1 php4/ext/standard/php_browscap.h:1.2 --- php4/ext/standard/php_browscap.h:1.1 Sat Dec 4 14:16:04 1999 +++ php4/ext/standard/php_browscap.h Fri Dec 17 15:55:24 1999 @@ -31,7 +31,7 @@ #ifndef _PHP_BROWSCAP_H #define _PHP_BROWSCAP_H -extern php3_module_entry browscap_module_entry; +extern zend_module_entry browscap_module_entry; #define browscap_module_ptr &browscap_module_entry extern PHP_MINIT_FUNCTION(browscap); Index: php4/ext/standard/php_crypt.h diff -u php4/ext/standard/php_crypt.h:1.1 php4/ext/standard/php_crypt.h:1.2 --- php4/ext/standard/php_crypt.h:1.1 Sat Dec 4 14:16:04 1999 +++ php4/ext/standard/php_crypt.h Fri Dec 17 15:55:24 1999 @@ -2,7 +2,7 @@ #define PHP_CRYPT_H #if HAVE_CRYPT -extern php3_module_entry crypt_module_entry; +extern zend_module_entry crypt_module_entry; #define crypt_module_ptr &crypt_module_entry PHP_FUNCTION(crypt); extern PHP_MINIT_FUNCTION(crypt); Index: php4/ext/standard/php_dir.h diff -u php4/ext/standard/php_dir.h:1.1 php4/ext/standard/php_dir.h:1.2 --- php4/ext/standard/php_dir.h:1.1 Sat Dec 4 14:16:04 1999 +++ php4/ext/standard/php_dir.h Fri Dec 17 15:55:24 1999 @@ -17,11 +17,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dir.h,v 1.1 1999/12/04 19:16:04 sas Exp $ */ +/* $Id: php_dir.h,v 1.2 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _PHP_DIR_H #define _PHP_DIR_H -extern php3_module_entry php3_dir_module_entry; +extern zend_module_entry php3_dir_module_entry; #define php3_dir_module_ptr &php3_dir_module_entry /* directory functions */ Index: php4/ext/standard/php_filestat.h diff -u php4/ext/standard/php_filestat.h:1.2 php4/ext/standard/php_filestat.h:1.3 --- php4/ext/standard/php_filestat.h:1.2 Sun Dec 5 09:16:36 1999 +++ php4/ext/standard/php_filestat.h Fri Dec 17 15:55:24 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_filestat.h,v 1.2 1999/12/05 14:16:36 rasmus Exp $ */ +/* $Id: php_filestat.h,v 1.3 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _FILESTAT_H #define _FILESTAT_H @@ -61,7 +61,7 @@ PHP_FUNCTION(touch); PHP_FUNCTION(clearstatcache); -extern php3_module_entry php3_filestat_module_entry; +extern zend_module_entry php3_filestat_module_entry; #define php3_filestat_module_ptr &php3_filestat_module_entry #define phpext_filestat_ptr php3_filestat_module_ptr Index: php4/ext/standard/php_mail.h diff -u php4/ext/standard/php_mail.h:1.1 php4/ext/standard/php_mail.h:1.2 --- php4/ext/standard/php_mail.h:1.1 Sat Dec 4 14:16:04 1999 +++ php4/ext/standard/php_mail.h Fri Dec 17 15:55:24 1999 @@ -28,12 +28,12 @@ */ -/* $Id: php_mail.h,v 1.1 1999/12/04 19:16:04 sas Exp $ */ +/* $Id: php_mail.h,v 1.2 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _MAIL_H #define _MAIL_H #if HAVE_SENDMAIL -extern php3_module_entry mail_module_entry; +extern zend_module_entry mail_module_entry; #define mail_module_ptr &mail_module_entry PHP_FUNCTION(mail); Index: php4/ext/standard/php_syslog.h diff -u php4/ext/standard/php_syslog.h:1.1 php4/ext/standard/php_syslog.h:1.2 --- php4/ext/standard/php_syslog.h:1.1 Sat Dec 4 14:16:04 1999 +++ php4/ext/standard/php_syslog.h Fri Dec 17 15:55:24 1999 @@ -32,7 +32,7 @@ #define _PHP_SYSLOG_H #if HAVE_SYSLOG_H -extern php3_module_entry syslog_module_entry; +extern zend_module_entry syslog_module_entry; #define syslog_module_ptr &syslog_module_entry extern PHP_MINIT_FUNCTION(syslog); Index: php4/ext/standard/reg.h diff -u php4/ext/standard/reg.h:1.4 php4/ext/standard/reg.h:1.5 --- php4/ext/standard/reg.h:1.4 Sat Jul 24 18:16:54 1999 +++ php4/ext/standard/reg.h Fri Dec 17 15:55:24 1999 @@ -28,12 +28,12 @@ */ -/* $Id: reg.h,v 1.4 1999/07/24 22:16:54 andrey Exp $ */ +/* $Id: reg.h,v 1.5 1999/12/17 20:55:24 zeev Exp $ */ #ifndef _REG_H #define _REG_H -extern php3_module_entry regexp_module_entry; +extern zend_module_entry regexp_module_entry; #define regexp_module_ptr &regexp_module_entry char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase, int extended); Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.9 php4/ext/standard/syslog.c:1.10 --- php4/ext/standard/syslog.c:1.9 Sat Dec 4 14:16:07 1999 +++ php4/ext/standard/syslog.c Fri Dec 17 15:55:24 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.9 1999/12/04 19:16:07 sas Exp $ */ +/* $Id: syslog.c,v 1.10 1999/12/17 20:55:24 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -265,13 +265,13 @@ }; -php3_module_entry syslog_module_entry = { +zend_module_entry syslog_module_entry = { "Syslog", syslog_functions, PHP_MINIT(syslog), NULL, PHP_RINIT(syslog), PHP_RSHUTDOWN(syslog), NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &syslog_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &syslog_module_entry; } #endif Index: php4/ext/sybase/php_sybase.h diff -u php4/ext/sybase/php_sybase.h:1.1 php4/ext/sybase/php_sybase.h:1.2 --- php4/ext/sybase/php_sybase.h:1.1 Sat Dec 4 14:16:07 1999 +++ php4/ext/sybase/php_sybase.h Fri Dec 17 15:55:25 1999 @@ -28,7 +28,7 @@ */ -/* $Id: php_sybase.h,v 1.1 1999/12/04 19:16:07 sas Exp $ */ +/* $Id: php_sybase.h,v 1.2 1999/12/17 20:55:25 zeev Exp $ */ #ifndef _PHP_SYBASE_H #define _PHP_SYBASE_H @@ -40,7 +40,7 @@ #if HAVE_SYBASE -extern php3_module_entry sybase_module_entry; +extern zend_module_entry sybase_module_entry; #define sybase_module_ptr &sybase_module_entry extern int php3_minit_sybase(INIT_FUNC_ARGS); Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.17 php4/ext/sybase/sybase.c:1.18 --- php4/ext/sybase/sybase.c:1.17 Fri Dec 17 14:51:31 1999 +++ php4/ext/sybase/sybase.c Fri Dec 17 15:55:25 1999 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.17 1999/12/17 19:51:31 zeev Exp $ */ +/* $Id: sybase.c,v 1.18 1999/12/17 20:55:25 zeev Exp $ */ #include "php.h" @@ -78,12 +78,12 @@ {NULL, NULL, NULL} }; -php3_module_entry sybase_module_entry = { +zend_module_entry sybase_module_entry = { "Sybase SQL", sybase_functions, php3_minit_sybase, php3_mshutdown_sybase, php3_rinit_sybase, php3_rshutdown_sybase, php3_info_sybase, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -php3_module_entry *get_module() { return &sybase_module_entry; } +zend_module_entry *get_module() { return &sybase_module_entry; } #endif THREAD_LS sybase_module php3_sybase_module; Index: php4/ext/sysvsem/php_sysvsem.h diff -u php4/ext/sysvsem/php_sysvsem.h:1.1 php4/ext/sysvsem/php_sysvsem.h:1.2 --- php4/ext/sysvsem/php_sysvsem.h:1.1 Sat Dec 4 14:16:08 1999 +++ php4/ext/sysvsem/php_sysvsem.h Fri Dec 17 15:55:26 1999 @@ -28,7 +28,7 @@ */ -/* $Id: php_sysvsem.h,v 1.1 1999/12/04 19:16:08 sas Exp $ */ +/* $Id: php_sysvsem.h,v 1.2 1999/12/17 20:55:26 zeev Exp $ */ #ifndef _PHP_SYSVSEM_H #define _PHP_SYSVSEM_H @@ -40,7 +40,7 @@ #if HAVE_SYSVSEM -extern php3_module_entry sysvsem_module_entry; +extern zend_module_entry sysvsem_module_entry; #define sysvsem_module_ptr &sysvsem_module_entry extern int php3_minit_sysvsem(INIT_FUNC_ARGS); Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.11 php4/ext/sysvsem/sysvsem.c:1.12 --- php4/ext/sysvsem/sysvsem.c:1.11 Fri Dec 17 14:51:33 1999 +++ php4/ext/sysvsem/sysvsem.c Fri Dec 17 15:55:26 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.11 1999/12/17 19:51:33 zeev Exp $ */ +/* $Id: sysvsem.c,v 1.12 1999/12/17 20:55:26 zeev Exp $ */ /* This has been built and tested on Solaris 2.6 and Linux 2.1.122. * It may not compile or execute correctly on other systems. @@ -61,7 +61,7 @@ }; #if COMPILE_DL -php3_module_entry *get_module() { return &sysvsem_module_entry; } +zend_module_entry *get_module() { return &sysvsem_module_entry; } #endif Index: php4/ext/sysvshm/php_sysvshm.h diff -u php4/ext/sysvshm/php_sysvshm.h:1.1 php4/ext/sysvshm/php_sysvshm.h:1.2 --- php4/ext/sysvshm/php_sysvshm.h:1.1 Sat Dec 4 14:16:09 1999 +++ php4/ext/sysvshm/php_sysvshm.h Fri Dec 17 15:55:27 1999 @@ -28,7 +28,7 @@ */ -/* $Id: php_sysvshm.h,v 1.1 1999/12/04 19:16:09 sas Exp $ */ +/* $Id: php_sysvshm.h,v 1.2 1999/12/17 20:55:27 zeev Exp $ */ #ifndef _PHP_SYSVSHM_H #define _PHP_SYSVSHM_H @@ -41,7 +41,7 @@ #if HAVE_SYSVSHM -extern php3_module_entry sysvshm_module_entry; +extern zend_module_entry sysvshm_module_entry; #define sysvshm_module_ptr &sysvshm_module_entry #include <sys/types.h> Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.12 php4/ext/sysvshm/sysvshm.c:1.13 --- php4/ext/sysvshm/sysvshm.c:1.12 Fri Dec 17 14:51:34 1999 +++ php4/ext/sysvshm/sysvshm.c Fri Dec 17 15:55:28 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.12 1999/12/17 19:51:34 zeev Exp $ */ +/* $Id: sysvshm.c,v 1.13 1999/12/17 20:55:28 zeev Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -51,7 +51,7 @@ #if COMPILE_DL -php3_module_entry *get_module() { return &sysvshm_module_entry; } +zend_module_entry *get_module() { return &sysvshm_module_entry; } #endif Index: php4/ext/xml/php_xml.h diff -u php4/ext/xml/php_xml.h:1.3 php4/ext/xml/php_xml.h:1.4 --- php4/ext/xml/php_xml.h:1.3 Sun Dec 5 11:43:42 1999 +++ php4/ext/xml/php_xml.h Fri Dec 17 15:55:29 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xml.h,v 1.3 1999/12/05 16:43:42 thies Exp $ */ +/* $Id: php_xml.h,v 1.4 1999/12/17 20:55:29 zeev Exp $ */ #ifndef _PHP_XML_H # define _PHP_XML_H @@ -80,7 +80,7 @@ } xml_encoding; -extern php3_module_entry xml_module_entry; +extern zend_module_entry xml_module_entry; # define xml_module_ptr &xml_module_entry enum php3_xml_option { Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.37 php4/ext/xml/xml.c:1.38 --- php4/ext/xml/xml.c:1.37 Fri Dec 17 14:51:35 1999 +++ php4/ext/xml/xml.c Fri Dec 17 15:55:29 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.37 1999/12/17 19:51:35 zeev Exp $ */ +/* $Id: xml.c,v 1.38 1999/12/17 20:55:29 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -121,7 +121,7 @@ {NULL, NULL, NULL} }; -php3_module_entry xml_module_entry = { +zend_module_entry xml_module_entry = { "XML", /* extension name */ xml_functions, /* extension function list */ PHP_MINIT(xml), /* extension-wide startup function */ Index: php4/ext/yp/php_yp.h diff -u php4/ext/yp/php_yp.h:1.2 php4/ext/yp/php_yp.h:1.3 --- php4/ext/yp/php_yp.h:1.2 Tue Dec 14 22:45:59 1999 +++ php4/ext/yp/php_yp.h Fri Dec 17 15:55:30 1999 @@ -26,7 +26,7 @@ | Authors: Stephanie Wehner <_@r4k.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_yp.h,v 1.2 1999/12/15 03:45:59 evan Exp $ */ +/* $Id: php_yp.h,v 1.3 1999/12/17 20:55:30 zeev Exp $ */ #ifndef _PHP_YP_H #define _PHP_YP_H @@ -38,7 +38,7 @@ #if HAVE_YP -extern php3_module_entry yp_module_entry; +extern zend_module_entry yp_module_entry; #define yp_module_ptr &yp_module_entry /* yp.c functions */ Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.1 php4/ext/zlib/php_zlib.h:1.2 --- php4/ext/zlib/php_zlib.h:1.1 Sat Dec 4 14:16:11 1999 +++ php4/ext/zlib/php_zlib.h Fri Dec 17 15:55:31 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zlib.h,v 1.1 1999/12/04 19:16:11 sas Exp $ */ +/* $Id: php_zlib.h,v 1.2 1999/12/17 20:55:31 zeev Exp $ */ #ifndef _PHP_ZLIB_H #define _PHP_ZLIB_H @@ -39,7 +39,7 @@ int gzgetss_state; } php_zlib_globals; -extern php3_module_entry php3_zlib_module_entry; +extern zend_module_entry php3_zlib_module_entry; #define zlib_module_ptr &php3_zlib_module_entry extern PHP_MINIT_FUNCTION(zlib); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.26 php4/ext/zlib/zlib.c:1.27 --- php4/ext/zlib/zlib.c:1.26 Fri Dec 17 14:16:48 1999 +++ php4/ext/zlib/zlib.c Fri Dec 17 15:55:31 1999 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.26 1999/12/17 19:16:48 zeev Exp $ */ +/* $Id: zlib.c,v 1.27 1999/12/17 20:55:31 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -98,7 +98,7 @@ {NULL, NULL, NULL} }; -php3_module_entry php3_zlib_module_entry = { +zend_module_entry php3_zlib_module_entry = { "zlib", php3_zlib_functions, PHP_MINIT(zlib), @@ -110,7 +110,7 @@ }; #if defined(COMPILE_DL) -DLEXPORT php3_module_entry *get_module(void) { return &php_zlib_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &php_zlib_module_entry; } #endif static void phpi_destructor_gzclose(gzFile *zp) {