cvs: /php4 php_sprintf.c /php4/sapi/fhttpd fhttpd.c /php4 fhttpd.c /php4 ChangeLog Makefile.am configuration-parser.y configuration-scanner.l
fopen-wrappers.c main.c rfc1867.c safe_mode.c /php4/dl/log log_db.c /php4/dl/mssql mssql.c /php4/ext/aspell aspell.c /php4/ext/com COM.c
/php4/ext/cpdf cpdf.c /php4/ext/db db.c /php4/ext/dba dba.c /php4/ext/dbase dbase.c /php4/ext/fdf fdf.c /php4/ext/ftp php_ftp.c /php4/ext/gd gd.c
gdt1.c /php4/ext/hyperwave hw.c /php4/ext/icap php3_icap.c /php4/ext/imap imap.c /php4/ext/interbase interbase.c /php4/ext/java java.c /php4/ext/ldap
ldap.c /php4/ext/mcal php3_mcal.c /php4/ext/oci8 oci8.c /php4/ext/odbc velocis.c /php4/ext/pdf pdf.c /php4/ext/pgsql pgsql.c /php4/ext/standard
base64.c base64.h dir.c file.c fsock.c fsock.h head.c head.h iptc.c output.c pageinfo.c pageinfo.h post.c type.c type.h url.c url.h /php4/ext/sybase
sybase.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c /php4/ext/xml xml.c /php4/sapi/apache sapi_apache.c /php4/sapi/cgi cgi_main.c
/php4/sapi/servlet servlet.c

zeev Fri Dec 17 14:51:42 1999 EDT Added files: /php4 php_sprintf.c /php4/sapi/fhttpd fhttpd.c Removed files: /php4 fhttpd.c Modified files: /php4 ChangeLog Makefile.am configuration-parser.y configuration-scanner.l fopen-wrappers.c main.c rfc1867.c safe_mode.c /php4/dl/log log_db.c /php4/dl/mssql mssql.c /php4/ext/aspell aspell.c /php4/ext/com COM.c /php4/ext/cpdf cpdf.c /php4/ext/db db.c /php4/ext/dba dba.c /php4/ext/dbase dbase.c /php4/ext/fdf fdf.c /php4/ext/ftp php_ftp.c /php4/ext/gd gd.c gdt1.c /php4/ext/hyperwave hw.c /php4/ext/icap php3_icap.c /php4/ext/imap imap.c /php4/ext/interbase interbase.c /php4/ext/java java.c /php4/ext/ldap ldap.c /php4/ext/mcal php3_mcal.c /php4/ext/oci8 oci8.c /php4/ext/odbc velocis.c /php4/ext/pdf pdf.c /php4/ext/pgsql pgsql.c /php4/ext/standard base64.c base64.h dir.c file.c fsock.c fsock.h head.c head.h iptc.c output.c pageinfo.c pageinfo.h post.c type.c type.h url.c url.h /php4/ext/sybase sybase.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c /php4/ext/xml xml.c /php4/sapi/apache sapi_apache.c /php4/sapi/cgi cgi_main.c /php4/sapi/servlet servlet.c Log: More php3_ annihilation Index: php4/ChangeLog diff -u php4/ChangeLog:1.250 php4/ChangeLog:1.251 --- php4/ChangeLog:1.250 Thu Dec 16 22:15:58 1999 +++ php4/ChangeLog Fri Dec 17 14:50:55 1999 @@ -6285,7 +6285,7 @@ mod_php4.c php.h php3_compat.h - php3_sprintf.c + php_sprintf.c php_ini.c rfc1867.c safe_mode.c @@ -7244,7 +7244,7 @@ php.h php3_realpath.c php3_realpath.h - php3_sprintf.c + php_sprintf.c php_globals.h php_ini.c php_ini.h @@ -9008,7 +9008,7 @@ main.c mod_php3.c php.h - php3_sprintf.c + php_sprintf.c php_regex.h request_info.c snprintf.c: * Get Apache to work. POST doesn't work yet. @@ -10976,7 +10976,7 @@ * php3_realpath.c php3_realpath.h - php3_sprintf.c + php_sprintf.c php3_threads.c php3_threads.h php3extra.dsw @@ -10984,7 +10984,7 @@ * php3_realpath.c php3_realpath.h - php3_sprintf.c + php_sprintf.c php3_threads.c php3_threads.h php3extra.dsw Index: php4/Makefile.am diff -u php4/Makefile.am:1.16 php4/Makefile.am:1.17 --- php4/Makefile.am:1.16 Sun Nov 28 18:01:57 1999 +++ php4/Makefile.am Fri Dec 17 14:50:56 1999 @@ -7,7 +7,7 @@ phptemp_LTLIBRARIES = libphp4.la libphp4_la_SOURCES = \ - main.c internal_functions.c snprintf.c php3_sprintf.c \ + main.c internal_functions.c snprintf.c php_sprintf.c \ configuration-parser.y configuration-scanner.l request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c \ php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \ Index: php4/configuration-parser.y diff -u php4/configuration-parser.y:1.23 php4/configuration-parser.y:1.24 --- php4/configuration-parser.y:1.23 Fri Dec 17 14:16:33 1999 +++ php4/configuration-parser.y Fri Dec 17 14:50:56 1999 @@ -19,7 +19,7 @@ -/* $Id: configuration-parser.y,v 1.23 1999/12/17 19:16:33 zeev Exp $ */ +/* $Id: configuration-parser.y,v 1.24 1999/12/17 19:50:56 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" @@ -48,7 +48,7 @@ static HashTable configuration_hash; #ifndef THREAD_SAFE extern HashTable browser_hash; -PHPAPI extern char *php3_ini_path; +PHPAPI extern char *php_ini_path; #endif static HashTable *active_zend_hash_table; static pval *current_section; @@ -155,7 +155,7 @@ #if USE_CONFIG_FILE { - char *env_location,*default_location,*php_ini_path; + char *env_location,*default_location,*php_ini_search_path; int safe_mode_state = PG(safe_mode); char *open_basedir = PG(open_basedir); char *opened_path; @@ -167,8 +167,8 @@ } #if WIN32|WINNT { - if (php3_ini_path) { - default_location = php3_ini_path; + if (php_ini_path) { + default_location = php_ini_path; } else { default_location = (char *) malloc(512); @@ -179,30 +179,30 @@ } } #else - if (!php3_ini_path) { + if (!php_ini_path) { default_location = CONFIGURATION_FILE_PATH; } else { - default_location = php3_ini_path; + default_location = php_ini_path; } #endif /* build a path */ - php_ini_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); + php_ini_search_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); - if (!php3_ini_path) { + if (!php_ini_path) { #if WIN32|WINNT - sprintf(php_ini_path,".;%s;%s",env_location,default_location); + sprintf(php_ini_search_path,".;%s;%s",env_location,default_location); #else - sprintf(php_ini_path,".:%s:%s",env_location,default_location); + sprintf(php_ini_search_path,".:%s:%s",env_location,default_location); #endif } else { /* if path was set via -c flag, only look there */ - strcpy(php_ini_path,default_location); + strcpy(php_ini_search_path,default_location); } PG(safe_mode) = 0; PG(open_basedir) = NULL; - cfgin = php_fopen_with_path("php.ini","r",php_ini_path,&opened_path); - free(php_ini_path); + cfgin = php_fopen_with_path("php.ini","r",php_ini_search_path,&opened_path); + free(php_ini_search_path); if (free_default_location) { free(default_location); } @@ -360,7 +360,7 @@ 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) { - php3_str_tolower($1.value.str.val,$1.value.str.len); + zend_str_tolower($1.value.str.val,$1.value.str.len); zend_hash_update(current_section->value.ht, $1.value.str.val, $1.value.str.len+1, &$3, sizeof(pval), NULL); } free($1.value.str.val); @@ -407,7 +407,7 @@ 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); - tmp.value.str.val = php3_strndup($1.value.str.val,$1.value.str.len); + 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; convert_browscap_pattern(&tmp); Index: php4/configuration-scanner.l diff -u php4/configuration-scanner.l:1.6 php4/configuration-scanner.l:1.7 --- php4/configuration-scanner.l:1.6 Sat Aug 7 11:58:51 1999 +++ php4/configuration-scanner.l Fri Dec 17 14:50:56 1999 @@ -70,7 +70,7 @@ <INITIAL>[ ]*("true"|"on"|"yes")[ ]* { - cfglval->value.str.val = php3_strndup("1",1); + cfglval->value.str.val = zend_strndup("1",1); cfglval->value.str.len = 1; cfglval->type = IS_STRING; return CFG_TRUE; @@ -78,7 +78,7 @@ <INITIAL>[ ]*("false"|"off"|"no")[ ]* { - cfglval->value.str.val = php3_strndup("",0); + cfglval->value.str.val = zend_strndup("",0); cfglval->value.str.len = 0; cfglval->type = IS_STRING; return CFG_FALSE; @@ -98,7 +98,7 @@ yytext++; yyleng--; - cfglval->value.str.val = php3_strndup(yytext,yyleng); + cfglval->value.str.val = zend_strndup(yytext,yyleng); cfglval->value.str.len = yyleng; cfglval->type = IS_STRING; return SECTION; @@ -114,7 +114,7 @@ /* eat leading " */ yytext++; - cfglval->value.str.val = php3_strndup(yytext,yyleng); + cfglval->value.str.val = zend_strndup(yytext,yyleng); cfglval->value.str.len = yyleng; cfglval->type = IS_STRING; return TC_ENCAPSULATED_STRING; @@ -144,7 +144,7 @@ } } if (yyleng!=0) { - cfglval->value.str.val = php3_strndup(yytext,yyleng); + cfglval->value.str.val = zend_strndup(yytext,yyleng); cfglval->value.str.len = yyleng; cfglval->type = IS_STRING; return TC_STRING; Index: php4/fopen-wrappers.c diff -u php4/fopen-wrappers.c:1.34 php4/fopen-wrappers.c:1.35 --- php4/fopen-wrappers.c:1.34 Fri Dec 17 14:16:33 1999 +++ php4/fopen-wrappers.c Fri Dec 17 14:50:56 1999 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.34 1999/12/17 19:16:33 zeev Exp $ */ +/* $Id: fopen-wrappers.c,v 1.35 1999/12/17 19:50:56 zeev Exp $ */ /* Synced with php3 revision 1.66 1999-06-18 [ssb] */ @@ -79,9 +79,9 @@ #include <sys/un.h> #endif -static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path); +static FILE *php_fopen_url_wrapper(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path); -int _php3_getftpresult(int socketd); +int php_get_ftp_result(int socketd); /* When open_basedir is not NULL, check if the given filename is located in @@ -194,7 +194,7 @@ be runtime enabled, NOT compile time. */ #if PHP3_URL_FOPEN if (!(options & IGNORE_URL)) { - return php3_fopen_url_wrapper(path, mode, options, issock, socketd, opened_path); + return php_fopen_url_wrapper(path, mode, options, issock, socketd, opened_path); } #endif @@ -432,7 +432,7 @@ * Otherwise, fopen is called as usual and the file pointer is returned. */ -static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path) +static FILE *php_fopen_url_wrapper(const char *path, char *mode, int options, int *issock, int *socketd, char **opened_path) { url *resource; int result; @@ -524,7 +524,7 @@ strcpy(scratch, resource->user); strcat(scratch, ":"); strcat(scratch, resource->pass); - tmp = _php3_base64_encode((unsigned char *)scratch, strlen(scratch), NULL); + tmp = php_base64_encode((unsigned char *)scratch, strlen(scratch), NULL); if (snprintf(hdr_line, sizeof(hdr_line), "Authorization: Basic %s\r\n", tmp) > 0) { @@ -595,7 +595,7 @@ *socketd = 0; free_url(resource); if (location[0] != '\0') { - return php3_fopen_url_wrapper(location, mode, options, issock, socketd, opened_path); + return php_fopen_url_wrapper(location, mode, options, issock, socketd, opened_path); } else { return NULL; } @@ -667,7 +667,7 @@ #endif /* Start talking to ftp server */ - result = _php3_getftpresult(*socketd); + result = php_get_ftp_result(*socketd); if (result > 299 || result < 200) { free_url(resource); SOCK_FCLOSE(*socketd); @@ -677,7 +677,7 @@ /* send the user name */ SOCK_WRITE("USER ", *socketd); if (resource->user != NULL) { - _php3_rawurldecode(resource->user, strlen(resource->user)); + php_raw_url_decode(resource->user, strlen(resource->user)); SOCK_WRITE(resource->user, *socketd); } else { SOCK_WRITE("anonymous", *socketd); @@ -685,13 +685,13 @@ SOCK_WRITE("\r\n", *socketd); /* get the response */ - result = _php3_getftpresult(*socketd); + result = php_get_ftp_result(*socketd); /* if a password is required, send it */ if (result >= 300 && result <= 399) { SOCK_WRITE("PASS ", *socketd); if (resource->pass != NULL) { - _php3_rawurldecode(resource->pass, strlen(resource->pass)); + php_raw_url_decode(resource->pass, strlen(resource->pass)); SOCK_WRITE(resource->pass, *socketd); } else { /* if the user has configured who they are, @@ -705,7 +705,7 @@ SOCK_WRITE("\r\n", *socketd); /* read the response */ - result = _php3_getftpresult(*socketd); + result = php_get_ftp_result(*socketd); if (result > 299 || result < 200) { free_url(resource); SOCK_FCLOSE(*socketd); @@ -721,7 +721,7 @@ /* set the connection to be binary */ SOCK_WRITE("TYPE I\r\n", *socketd); - result = _php3_getftpresult(*socketd); + result = php_get_ftp_result(*socketd); if (result > 299 || result < 200) { free_url(resource); SOCK_FCLOSE(*socketd); @@ -735,7 +735,7 @@ SOCK_WRITE("\r\n", *socketd); /* read the response */ - result = _php3_getftpresult(*socketd); + result = php_get_ftp_result(*socketd); if (mode[0] == 'r') { /* when reading file, it must exist */ if (result > 299 || result < 200) { @@ -918,7 +918,7 @@ return NULL; } -int _php3_getftpresult(int socketd) +int php_get_ftp_result(int socketd) { char tmp_line[513]; Index: php4/main.c diff -u php4/main.c:1.159 php4/main.c:1.160 --- php4/main.c:1.159 Fri Dec 17 14:16:33 1999 +++ php4/main.c Fri Dec 17 14:50:56 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.159 1999/12/17 19:16:33 zeev Exp $ */ +/* $Id: main.c,v 1.160 1999/12/17 19:50:56 zeev Exp $ */ #include <stdio.h> @@ -105,7 +105,7 @@ /* True globals (no need for thread safety) */ HashTable configuration_hash; -PHPAPI char *php3_ini_path = NULL; +PHPAPI char *php_ini_path = NULL; #define SAFE_FILENAME(f) ((f)?(f):"-") @@ -259,36 +259,6 @@ /* True global (no need for thread safety */ static int module_initialized = 0; -#if 0 -#if APACHE -void php3_apache_puts(const char *s) -{ - SLS_FETCH(); - - if (SG(server_context)) { - if(rputs(s, (request_rec *) SG(server_context))==-1) { - PG(connection_status) |= PHP_CONNECTION_ABORTED; - } - } else { - fputs(s, stdout); - } -} - -void php3_apache_putc(char c) -{ - SLS_FETCH(); - - if (SG(server_context)) { - if(rputc(c, (request_rec *) SG(server_context))!=c) { - PG(connection_status) |= PHP_CONNECTION_ABORTED; - } - } else { - fputc(c, stdout); - } -} -#endif -#endif - void php_log_err(char *log_message) { FILE *log_file; @@ -337,7 +307,7 @@ #endif /*APACHE */ #if CGI_BINARY - if (php3_header()) { + if (php_header()) { fprintf(stderr, log_message); fprintf(stderr, "\n"); } @@ -583,9 +553,9 @@ int old_chunk_size; FILE *retval; - old_chunk_size = _php3_sock_set_def_chunk_size(1); + old_chunk_size = php_sock_set_def_chunk_size(1); retval=php_fopen_wrapper((char *) filename, "r", USE_PATH|IGNORE_URL_WIN, &issock, &socketd, opened_path); - _php3_sock_set_def_chunk_size(old_chunk_size); + php_sock_set_def_chunk_size(old_chunk_size); if (issock) { retval = fdopen(socketd, "r"); @@ -729,7 +699,7 @@ * function that gets triggered when our request pool is destroyed. * We need this because at any point in our code we can be interrupted * and that may happen before we have had time to free our memory. - * The php3_shutdown function needs to free all outstanding allocated + * The php_request_shutdown function needs to free all outstanding allocated * memory. */ block_alarms(); @@ -827,7 +797,7 @@ } -static int php3_config_ini_startup(void) +static int php_config_ini_startup(void) { if (php_init_config() == FAILURE) { php_printf("PHP: Unable to parse configuration file.\n"); @@ -836,7 +806,7 @@ return SUCCESS; } -static void php3_config_ini_shutdown(void) +static void php_config_ini_shutdown(void) { php_shutdown_config(); } @@ -980,7 +950,7 @@ php_ini_mstartup(); - if (php3_config_ini_startup() == FAILURE) { + if (php_config_ini_startup() == FAILURE) { return FAILURE; } @@ -1026,7 +996,7 @@ } #if !USE_SAPI /* close down the ini config */ - php3_config_ini_shutdown(); + php_config_ini_shutdown(); #endif #if (WIN32|WINNT) && !(USE_SAPI) Index: php4/rfc1867.c diff -u php4/rfc1867.c:1.15 php4/rfc1867.c:1.16 --- php4/rfc1867.c:1.15 Sun Dec 5 11:25:28 1999 +++ php4/rfc1867.c Fri Dec 17 14:50:56 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.15 1999/12/05 16:25:28 sas Exp $ */ +/* $Id: rfc1867.c,v 1.16 1999/12/17 19:50:56 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -159,7 +159,7 @@ php_parse_gpc_data2(ptr,namebuf,http_post_vars ELS_CC PLS_CC); /* And a little kludge to pick out special MAX_FILE_SIZE */ - itype = php3_check_ident_type(namebuf); + itype = php_check_ident_type(namebuf); if (itype) { u = strchr(namebuf, '['); if (u) @@ -217,7 +217,7 @@ } bytes = fwrite(ptr, 1, loc - ptr - 4, fp); fclose(fp); - php3_list_insert(fn,php_file_le_uploads()); /* Tell PHP about the file so the destructor can unlink it later */ + zend_list_insert(fn,php_file_le_uploads()); /* Tell PHP about the file so the destructor can unlink it later */ if (bytes < (loc - ptr - 4)) { php_error(E_WARNING, "Only %d bytes were written, expected to write %ld", bytes, loc - ptr - 4); } Index: php4/safe_mode.c diff -u php4/safe_mode.c:1.9 php4/safe_mode.c:1.10 --- php4/safe_mode.c:1.9 Fri Dec 17 14:16:34 1999 +++ php4/safe_mode.c Fri Dec 17 14:50:56 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: safe_mode.c,v 1.9 1999/12/17 19:16:34 zeev Exp $ */ +/* $Id: safe_mode.c,v 1.10 1999/12/17 19:50:56 zeev Exp $ */ #include "php.h" @@ -64,7 +64,7 @@ } if (ret>-1) { uid=sb.st_uid; - if (uid==_php3_getuid()) return(1); + if (uid==php_getuid()) return(1); } } s = strrchr(fn,'/'); @@ -100,7 +100,7 @@ } duid = sb.st_uid; } - if (duid == (uid=_php3_getuid())) return(1); + if (duid == (uid=php_getuid())) return(1); else { php_error(E_WARNING, "SAFE MODE Restriction in effect. The script whose uid is %ld is not allowed to access %s owned by uid %ld",uid,fn,duid); return(0); Index: php4/dl/log/log_db.c diff -u php4/dl/log/log_db.c:1.2 php4/dl/log/log_db.c:1.3 --- php4/dl/log/log_db.c:1.2 Mon Aug 2 15:16:37 1999 +++ php4/dl/log/log_db.c Fri Dec 17 14:51:00 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: log_db.c,v 1.2 1999/08/02 19:16:37 zeev Exp $ */ +/* $Id: log_db.c,v 1.3 1999/12/17 19:51:00 zeev Exp $ */ #include "phpdl.h" #include "log.h" @@ -84,7 +84,7 @@ } /* see if the log directory exists for this page-owner's uid */ - sprintf(path, "%s/%ld", log_conf.dbm_log_dir, _php3_getuid()); + sprintf(path, "%s/%ld", log_conf.dbm_log_dir, php_getuid()); if (stat(path, &sb) == -1) { if (mkdir(path, 0755)==-1) { php_error(E_WARNING, "Trying to create user log directory [%s]: %d [%s]",path,errno,strerror(errno)); @@ -94,7 +94,7 @@ } /* construct the full path for the database */ - sprintf(path, "%s/%ld/%s.log", log_conf.dbm_log_dir, _php3_getuid(), log_stats.logfile); + sprintf(path, "%s/%ld/%s.log", log_conf.dbm_log_dir, php_getuid(), log_stats.logfile); es = EG(error_reporting); EG(error_reporting) = 0; @@ -187,7 +187,7 @@ ELS_FETCH(); /* construct the full path for the database */ - sprintf(path, "%s/%ld/%s.log", log_conf.dbm_log_dir, _php3_getuid(), log_stats.logfile); + sprintf(path, "%s/%ld/%s.log", log_conf.dbm_log_dir, php_getuid(), log_stats.logfile); es = EG(error_reporting); EG(error_reporting) = 0; Index: php4/dl/mssql/mssql.c diff -u php4/dl/mssql/mssql.c:1.8 php4/dl/mssql/mssql.c:1.9 --- php4/dl/mssql/mssql.c:1.8 Sat Dec 4 14:15:42 1999 +++ php4/dl/mssql/mssql.c Fri Dec 17 14:51:01 1999 @@ -469,7 +469,7 @@ } } } - return_value->value.lval = php3_list_insert(mssql_ptr,msSQL_GLOBAL(le_plink)); + return_value->value.lval = zend_list_insert(mssql_ptr,msSQL_GLOBAL(le_plink)); } else { /* non persistent */ list_entry *index_ptr,new_index_ptr; @@ -490,7 +490,7 @@ RETURN_FALSE; } link = (int) index_ptr->ptr; - ptr = php3_list_find(link,&type); /* check if the link is still there */ + ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==msSQL_GLOBAL(le_link) || type==msSQL_GLOBAL(le_plink))) { return_value->value.lval = msSQL_GLOBAL(default_link) = link; return_value->type = IS_LONG; @@ -523,7 +523,7 @@ /* add it to the list */ mssql_ptr = (mssql_link *) emalloc(sizeof(mssql_link)); memcpy(mssql_ptr,&mssql,sizeof(mssql_link)); - return_value->value.lval = php3_list_insert(mssql_ptr,msSQL_GLOBAL(le_link)); + return_value->value.lval = zend_list_insert(mssql_ptr,msSQL_GLOBAL(le_link)); /* add it to the hash */ new_index_ptr.ptr = (void *) return_value->value.lval; @@ -592,13 +592,13 @@ break; } - php3_list_find(id,&type); + zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_link) && type!=msSQL_GLOBAL(le_plink)) { php_error(E_WARNING,"%d is not a MS SQL link index",id); RETURN_FALSE; } - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } @@ -632,7 +632,7 @@ CHECK_LINK(id); - mssql_ptr = (mssql_link *) php3_list_find(id,&type); + mssql_ptr = (mssql_link *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_link) && type!=msSQL_GLOBAL(le_plink)) { php_error(E_WARNING,"%d is not a MS SQL link index",id); RETURN_FALSE; @@ -782,7 +782,7 @@ break; } - mssql_ptr = (mssql_link *) php3_list_find(id,&type); + mssql_ptr = (mssql_link *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_link) && type!=msSQL_GLOBAL(le_plink)) { php_error(E_WARNING,"%d is not a MS SQL link index",id); RETURN_FALSE; @@ -883,7 +883,7 @@ } } efree(column_types); - return_value->value.lval = php3_list_insert(result,msSQL_GLOBAL(le_result)); + return_value->value.lval = zend_list_insert(result,msSQL_GLOBAL(le_result)); return_value->type = IS_LONG; } @@ -904,13 +904,13 @@ if (mssql_result_index->value.lval==0) { RETURN_FALSE; } - result = (mssql_result *) php3_list_find(mssql_result_index->value.lval,&type); + result = (mssql_result *) zend_list_find(mssql_result_index->value.lval,&type); if (type!=msSQL_GLOBAL(le_result)) { // php_error(E_WARNING,"%d is not a MS SQL result index",mssql_result_index->value.lval); RETURN_FALSE; } - php3_list_delete(mssql_result_index->value.lval); + zend_list_delete(mssql_result_index->value.lval); RETURN_TRUE; } @@ -938,7 +938,7 @@ convert_to_long(result_index); id = result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -964,7 +964,7 @@ convert_to_long(result_index); id = result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -991,7 +991,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -1026,7 +1026,7 @@ } convert_to_long(mssql_result_index); - result = (mssql_result *) php3_list_find(mssql_result_index->value.lval,&type); + result = (mssql_result *) zend_list_find(mssql_result_index->value.lval,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",mssql_result_index->value.lval); @@ -1083,7 +1083,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -1180,7 +1180,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -1238,7 +1238,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -1290,7 +1290,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -1343,7 +1343,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -1381,7 +1381,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; @@ -1415,7 +1415,7 @@ convert_to_long(mssql_result_index); id = mssql_result_index->value.lval; - result = (mssql_result *) php3_list_find(id,&type); + result = (mssql_result *) zend_list_find(id,&type); if (type!=msSQL_GLOBAL(le_result)) { php_error(E_WARNING,"%d is not a MS SQL result index",id); RETURN_FALSE; Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.7 php4/ext/aspell/aspell.c:1.8 --- php4/ext/aspell/aspell.c:1.7 Sat Dec 4 14:15:43 1999 +++ php4/ext/aspell/aspell.c Fri Dec 17 14:51:02 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.7 1999/12/04 19:15:43 sas Exp $ */ +/* $Id: aspell.c,v 1.8 1999/12/17 19:51:02 zeev Exp $ */ #include "php.h" #if defined(COMPILE_DL) @@ -88,7 +88,7 @@ else sc=aspell_new((*master)->value.str.val,""); - ind = php3_list_insert(sc, le_aspell); + ind = zend_list_insert(sc, le_aspell); RETURN_LONG(ind); } /* }}} */ @@ -112,7 +112,7 @@ } convert_to_long_ex(scin); convert_to_string_ex(word); - sc = (aspell *)php3_list_find((*scin)->value.lval, &type); + sc = (aspell *)zend_list_find((*scin)->value.lval, &type); if(!sc) { php_error(E_WARNING, "%d is not an ASPELL result index",(*scin)->value.lval); @@ -146,7 +146,7 @@ } convert_to_long_ex(scin); convert_to_string_ex(word); - sc= (aspell *) php3_list_find((*scin)->value.lval, &type); + sc= (aspell *) zend_list_find((*scin)->value.lval, &type); if(!sc) { php_error(E_WARNING, "%d is not an ASPELL result index",(*scin)->value.lval); @@ -178,7 +178,7 @@ } convert_to_long_ex(scin); convert_to_string_ex(word); - sc = (aspell *)php3_list_find((*scin)->value.lval, &type); + sc = (aspell *)zend_list_find((*scin)->value.lval, &type); if(!sc) { php_error(E_WARNING, "%d is not an ASPELL result index",(*scin)->value.lval); Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.16 php4/ext/com/COM.c:1.17 --- php4/ext/com/COM.c:1.16 Thu Dec 2 21:25:21 1999 +++ php4/ext/com/COM.c Fri Dec 17 14:51:03 1999 @@ -306,7 +306,7 @@ RETURN_FALSE; } - RETURN_LONG(php3_list_insert(i_dispatch,le_idispatch)); + RETURN_LONG(zend_list_insert(i_dispatch,le_idispatch)); } @@ -418,7 +418,7 @@ handle = (pval *) emalloc(sizeof(pval)); handle->type = IS_LONG; - handle->value.lval = php3_list_insert(var_arg->pdispVal, le_idispatch); + handle->value.lval = zend_list_insert(var_arg->pdispVal, le_idispatch); pval_copy_constructor(handle); INIT_PZVAL(handle); zend_hash_index_update(pval_arg->value.obj.properties, 0, &handle, sizeof(pval *), NULL); @@ -565,7 +565,7 @@ /* obtain i_dispatch interface */ convert_to_long(object); - i_dispatch = php3_list_find(object->value.lval, &type); + i_dispatch = zend_list_find(object->value.lval, &type); if (!i_dispatch || (type!=le_idispatch)) { php_error(E_WARNING,"%d is not a COM object handler", function_name->value.str.val); RETURN_FALSE; @@ -731,7 +731,7 @@ /* obtain i_dispatch interface */ convert_to_long(arg_idispatch); /* obtain i_dispatch interface */ - i_dispatch = php3_list_find(arg_idispatch->value.lval,&type); + i_dispatch = zend_list_find(arg_idispatch->value.lval,&type); if (!i_dispatch || (type!=le_idispatch)) { php_error(E_WARNING,"%d is not a COM object handler", arg_idispatch->value.lval); } @@ -757,7 +757,7 @@ /* obtain i_dispatch interface */ convert_to_long(arg_idispatch); /* obtain i_dispatch interface */ - i_dispatch = php3_list_find(arg_idispatch->value.lval,&type); + i_dispatch = zend_list_find(arg_idispatch->value.lval,&type); if (!i_dispatch || (type!=le_idispatch)) { php_error(E_WARNING,"%d is not a COM object handler", arg_idispatch->value.lval); } @@ -780,7 +780,7 @@ /* fetch the IDispatch interface */ zend_hash_index_find(object->value.obj.properties, 0, (void **) &idispatch_handle); - i_dispatch = php3_list_find((*idispatch_handle)->value.lval,&type); + i_dispatch = zend_list_find((*idispatch_handle)->value.lval,&type); if (!i_dispatch || (type!=le_idispatch)) { /* bail out */ } @@ -851,7 +851,7 @@ /* fetch the IDispatch interface */ zend_hash_index_find(object->value.obj.properties, 0, (void **) &idispatch_handle); - i_dispatch = php3_list_find((*idispatch_handle)->value.lval,&type); + i_dispatch = zend_list_find((*idispatch_handle)->value.lval,&type); if (!i_dispatch || (type!=le_idispatch)) { /* bail out */ } Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.4 php4/ext/cpdf/cpdf.c:1.5 --- php4/ext/cpdf/cpdf.c:1.4 Fri Dec 17 14:16:35 1999 +++ php4/ext/cpdf/cpdf.c Fri Dec 17 14:51:05 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.4 1999/12/17 19:16:35 zeev Exp $ */ +/* $Id: cpdf.c,v 1.5 1999/12/17 19:51:05 zeev Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -206,7 +206,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -234,7 +234,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -262,7 +262,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -290,7 +290,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -321,7 +321,7 @@ convert_to_long(argv[1]); id=argv[0]->value.lval; pagemode=argv[1]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -383,7 +383,7 @@ } cpdf_init(cpdf); - id = php3_list_insert(cpdf, CPDF_GLOBAL(le_cpdf)); + id = zend_list_insert(cpdf, CPDF_GLOBAL(le_cpdf)); RETURN_LONG(id); } /* }}} */ @@ -402,12 +402,12 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } @@ -440,7 +440,7 @@ orientation=argv[2]->value.lval; height = argv[3]->value.lval; width = argv[4]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -475,7 +475,7 @@ convert_to_long(arg2); id=arg1->value.lval; pagenr=arg2->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -503,7 +503,7 @@ convert_to_long(arg2); id=arg1->value.lval; pagenr=arg2->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -529,7 +529,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -555,7 +555,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -582,7 +582,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -613,7 +613,7 @@ convert_to_double(argv[2]); convert_to_double(argv[3]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -647,7 +647,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -674,7 +674,7 @@ convert_to_long(argv[0]); convert_to_string(argv[1]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -766,7 +766,7 @@ convert_to_double(arg3); convert_to_string(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -797,7 +797,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -824,7 +824,7 @@ convert_to_long(arg1); convert_to_long(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -851,7 +851,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -878,7 +878,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -909,7 +909,7 @@ convert_to_array(arg2); id=arg1->value.lval; matrix=arg2->value.ht; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -961,7 +961,7 @@ convert_to_double(argv[1]); convert_to_double(argv[2]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -995,7 +995,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1022,7 +1022,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1049,7 +1049,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1077,7 +1077,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1103,7 +1103,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1129,7 +1129,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1157,7 +1157,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1185,7 +1185,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1212,7 +1212,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1240,7 +1240,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1272,7 +1272,7 @@ convert_to_long(arg1); convert_to_long(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1304,7 +1304,7 @@ convert_to_long(arg1); convert_to_long(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1336,7 +1336,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1368,7 +1368,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1398,7 +1398,7 @@ convert_to_long(arg2); convert_to_long(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1430,7 +1430,7 @@ convert_to_double(argv[1]); convert_to_double(argv[2]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1467,7 +1467,7 @@ convert_to_double(argv[1]); convert_to_double(argv[2]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1508,7 +1508,7 @@ convert_to_double(argv[5]); convert_to_double(argv[6]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1555,7 +1555,7 @@ convert_to_double(argv[1]); convert_to_double(argv[2]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1592,7 +1592,7 @@ convert_to_double(argv[1]); convert_to_double(argv[2]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1630,7 +1630,7 @@ convert_to_double(argv[2]); convert_to_double(argv[3]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1670,7 +1670,7 @@ convert_to_double(argv[4]); convert_to_double(argv[5]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1709,7 +1709,7 @@ convert_to_double(argv[3]); convert_to_double(argv[4]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1748,7 +1748,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1774,7 +1774,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1800,7 +1800,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1827,7 +1827,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1853,7 +1853,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1879,7 +1879,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1906,7 +1906,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1934,7 +1934,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1961,7 +1961,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1988,7 +1988,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2015,7 +2015,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2044,7 +2044,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2073,7 +2073,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2102,7 +2102,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2133,7 +2133,7 @@ convert_to_long(arg5); convert_to_long(arg6); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2160,7 +2160,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2188,14 +2188,14 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } buffer = cpdf_getBufferForPDF(pdf, &lenght); - php3_header(); + php_header(); php_write(buffer, lenght); RETURN_TRUE; @@ -2217,7 +2217,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2264,7 +2264,7 @@ yscale = (float) argv[8]->value.dval; convert_to_long(argv[9]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2329,14 +2329,14 @@ convert_to_double(argv[6]); convert_to_long(argv[7]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } gid=argv[1]->value.lval; - im = php3_list_find(gid, &type); + im = zend_list_find(gid, &type); if (!im || type != phpi_get_le_gd()) { php3_error(E_WARNING, "cpdf: Unable to find image pointer"); RETURN_FALSE; @@ -2411,7 +2411,7 @@ convert_to_string(argv[5]); convert_to_string(argv[6]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2470,7 +2470,7 @@ convert_to_double(argv[4]); convert_to_string(argv[5]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2527,14 +2527,14 @@ convert_to_long(argv[4]); convert_to_string(argv[5]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } oid=argv[1]->value.lval; - lastoutline = php3_list_find(oid,&type); + 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); @@ -2548,7 +2548,7 @@ argv[5]->value.str.val, 1, 0.0, 0.0, 0.0, 0.0); - id = php3_list_insert(lastoutline,CPDF_GLOBAL(le_outline)); + id = zend_list_insert(lastoutline,CPDF_GLOBAL(le_outline)); RETURN_LONG(id); } /* }}} */ Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.14 php4/ext/db/db.c:1.15 --- php4/ext/db/db.c:1.14 Fri Dec 17 14:16:36 1999 +++ php4/ext/db/db.c Fri Dec 17 14:51:06 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.14 1999/12/17 19:16:36 zeev Exp $ */ +/* $Id: db.c,v 1.15 1999/12/17 19:51:06 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -196,7 +196,7 @@ /* didn't find it as a database filename, try as a number */ convert_to_long(id); - info = php3_list_find(id->value.lval, &info_type); + info = zend_list_find(id->value.lval, &info_type); if (info_type != DBM_GLOBAL(le_db)) return NULL; return info; @@ -265,7 +265,7 @@ info = _php3_dbmopen(filename->value.str.val, mode->value.str.val); if (info) { - ret = php3_list_insert(info, DBM_GLOBAL(le_db)); + ret = zend_list_insert(info, DBM_GLOBAL(le_db)); RETURN_LONG(ret); } else { RETURN_FALSE; @@ -417,7 +417,7 @@ } convert_to_long(id); - if (php3_list_delete(id->value.lval) == SUCCESS) { + if (zend_list_delete(id->value.lval) == SUCCESS) { RETURN_TRUE; } else { RETURN_FALSE; Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.7 php4/ext/dba/dba.c:1.8 --- php4/ext/dba/dba.c:1.7 Sat Dec 4 14:15:46 1999 +++ php4/ext/dba/dba.c Fri Dec 17 14:51:07 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.7 1999/12/04 19:15:46 sas Exp $ */ +/* $Id: dba.c,v 1.8 1999/12/17 19:51:07 zeev Exp $ */ #include "php.h" @@ -107,7 +107,7 @@ convert_to_string_ex(key) #define DBA_IF_NOT_CORRECT_TYPE(link_id) \ - info = php3_list_find(link_id, &type); \ + info = zend_list_find(link_id, &type); \ if(!info || (type != GLOBAL(le_db) && type != GLOBAL(le_pdb))) #define DBA_ID_GET \ @@ -204,7 +204,7 @@ { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.7 1999/12/04 19:15:46 sas Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.8 1999/12/17 19:51:07 zeev Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); @@ -277,7 +277,7 @@ if(zend_hash_find(&ht_keys, key, keylen, (void **) &info) == SUCCESS) { FREENOW; - RETURN_LONG(php3_list_insert(info, GLOBAL(le_pdb))); + RETURN_LONG(zend_list_insert(info, GLOBAL(le_pdb))); } } @@ -327,7 +327,7 @@ info->argc = 0; info->argv = NULL; - listid = php3_list_insert(info, persistent?GLOBAL(le_pdb):GLOBAL(le_db)); + listid = zend_list_insert(info, persistent?GLOBAL(le_pdb):GLOBAL(le_db)); if(persistent) { zend_hash_update(&ht_keys, key, keylen, info, sizeof(*info), NULL); } @@ -361,7 +361,7 @@ { DBA_ID_GET1; - php3_list_delete((*id)->value.lval); + zend_list_delete((*id)->value.lval); } /* }}} */ Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.12 php4/ext/dbase/dbase.c:1.13 --- php4/ext/dbase/dbase.c:1.12 Fri Dec 17 14:16:37 1999 +++ php4/ext/dbase/dbase.c Fri Dec 17 14:51:08 1999 @@ -137,7 +137,7 @@ RETURN_FALSE; } - handle = php3_list_insert(dbh, DBase_GLOBAL(le_dbhead)); + handle = zend_list_insert(dbh, DBase_GLOBAL(le_dbhead)); RETURN_LONG(handle); } /* }}} */ @@ -154,13 +154,13 @@ WRONG_PARAM_COUNT; } convert_to_long(dbh_id); - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; } - php3_list_delete(dbh_id->value.lval); + zend_list_delete(dbh_id->value.lval); RETURN_TRUE; } /* }}} */ @@ -177,7 +177,7 @@ WRONG_PARAM_COUNT; } convert_to_long(dbh_id); - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -199,7 +199,7 @@ WRONG_PARAM_COUNT; } convert_to_long(dbh_id); - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -221,7 +221,7 @@ WRONG_PARAM_COUNT; } convert_to_long(dbh_id); - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -255,7 +255,7 @@ RETURN_FALSE; } - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -324,7 +324,7 @@ RETURN_FALSE; } - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -383,7 +383,7 @@ convert_to_long(dbh_id); convert_to_long(record); - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -420,7 +420,7 @@ convert_to_long(dbh_id); convert_to_long(record); - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -503,7 +503,7 @@ convert_to_long(dbh_id); convert_to_long(record); - dbh = php3_list_find(dbh_id->value.lval, &dbh_type); + dbh = zend_list_find(dbh_id->value.lval, &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { php_error(E_WARNING, "Unable to find database for identifier %d", dbh_id->value.lval); RETURN_FALSE; @@ -704,7 +704,7 @@ dbh->db_rlen = rlen; put_dbf_info(dbh); - handle = php3_list_insert(dbh, DBase_GLOBAL(le_dbhead)); + handle = zend_list_insert(dbh, DBase_GLOBAL(le_dbhead)); RETURN_LONG(handle); } /* }}} */ Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.12 php4/ext/fdf/fdf.c:1.13 --- php4/ext/fdf/fdf.c:1.12 Wed Dec 15 10:27:51 1999 +++ php4/ext/fdf/fdf.c Fri Dec 17 14:51:10 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.12 1999/12/15 15:27:51 steinm Exp $ */ +/* $Id: fdf.c,v 1.13 1999/12/17 19:51:10 zeev Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -141,7 +141,7 @@ if(!fdf) RETURN_FALSE; - id = php3_list_insert(fdf,FDF_GLOBAL(le_fdf)); + id = zend_list_insert(fdf,FDF_GLOBAL(le_fdf)); RETURN_LONG(id); } /* }}} */ @@ -159,14 +159,14 @@ convert_to_long_ex(arg1); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } /* FDFClose(fdf); */ - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } /* }}} */ @@ -185,7 +185,7 @@ if(!fdf) RETURN_FALSE; - id = php3_list_insert(fdf,FDF_GLOBAL(le_fdf)); + id = zend_list_insert(fdf,FDF_GLOBAL(le_fdf)); RETURN_LONG(id); } /* }}} */ @@ -208,7 +208,7 @@ convert_to_long_ex(arg1); convert_to_string_ex(arg2); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -251,7 +251,7 @@ convert_to_string_ex(arg3); convert_to_long_ex(arg4); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -292,7 +292,7 @@ fieldname = NULL; } id=(*argv[0])->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -333,7 +333,7 @@ convert_to_string_ex(arg4); convert_to_long_ex(arg5); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -379,7 +379,7 @@ convert_to_long_ex(arg1); convert_to_string_ex(arg2); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -410,7 +410,7 @@ convert_to_long_ex(arg1); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -446,7 +446,7 @@ convert_to_long_ex(arg1); convert_to_string_ex(arg2); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -477,7 +477,7 @@ convert_to_long_ex(arg1); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -513,7 +513,7 @@ convert_to_long_ex(arg1); convert_to_string_ex(arg2); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -546,7 +546,7 @@ convert_to_string_ex(arg4); convert_to_long_ex(arg5); id=(*arg1)->value.lval; - fdf = php3_list_find(id,&type); + fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.10 php4/ext/ftp/php_ftp.c:1.11 --- php4/ext/ftp/php_ftp.c:1.10 Sun Dec 12 05:51:13 1999 +++ php4/ext/ftp/php_ftp.c Fri Dec 17 14:51:11 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.10 1999/12/12 10:51:13 sas Exp $ */ +/* $Id: php_ftp.c,v 1.11 1999/12/17 19:51:11 zeev Exp $ */ #include "php.h" @@ -118,7 +118,7 @@ int id, type; \ convert_to_long(pval); \ id = (pval)->value.lval; \ - (ftp) = php3_list_find(id, &type); \ + (ftp) = zend_list_find(id, &type); \ if (!(ftp) || type != le_ftpbuf) { \ php_error(E_WARNING, "Unable to find ftpbuf %d", id); \ RETURN_FALSE; \ @@ -175,7 +175,7 @@ if (ftp == NULL) RETURN_FALSE; - RETURN_LONG(php3_list_insert(ftp, le_ftpbuf)); + RETURN_LONG(zend_list_insert(ftp, le_ftpbuf)); } /* }}} */ @@ -786,8 +786,8 @@ } id = arg1->value.lval; - if (php3_list_find(id, &type) && type == le_ftpbuf) - php3_list_delete(id); + if (zend_list_find(id, &type) && type == le_ftpbuf) + zend_list_delete(id); RETURN_TRUE; } Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.29 php4/ext/gd/gd.c:1.30 --- php4/ext/gd/gd.c:1.29 Fri Dec 17 14:16:40 1999 +++ php4/ext/gd/gd.c Fri Dec 17 14:51:12 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.29 1999/12/17 19:16:40 zeev Exp $ */ +/* $Id: gd.c,v 1.30 1999/12/17 19:51:12 zeev Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -363,7 +363,7 @@ * that overlap with the old fonts (with indices 1-5). The first * list index given out is always 1. */ - ind = 5 + php3_list_insert(font, GD_GLOBAL(le_gd_font)); + ind = 5 + zend_list_insert(font, GD_GLOBAL(le_gd_font)); RETURN_LONG(ind); } @@ -386,7 +386,7 @@ convert_to_long(y_size); im = gdImageCreate(x_size->value.lval, y_size->value.lval); - ind = php3_list_insert(im, GD_GLOBAL(le_gd)); + ind = zend_list_insert(im, GD_GLOBAL(le_gd)); RETURN_LONG(ind); } @@ -423,7 +423,7 @@ im = gdImageCreateFromPng (fp); fflush(fp); fclose(fp); - ind = php3_list_insert(im, GD_GLOBAL(le_gd)); + ind = zend_list_insert(im, GD_GLOBAL(le_gd)); RETURN_LONG(ind); } /* }}} */ @@ -452,7 +452,7 @@ RETURN_FALSE; } } - im = php3_list_find(imgind->value.lval, &ind_type); + 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"); RETURN_FALSE; @@ -476,7 +476,7 @@ php3_error(E_WARNING, "Unable to open temporary file"); RETURN_FALSE; } - output = php3_header(); + output = php_header(); if (output) { gdImagePng (im, tmp); fseek(tmp, 0, SEEK_SET); @@ -536,7 +536,7 @@ fflush(fp); fclose(fp); - ind = php3_list_insert(im, GD_GLOBAL(le_gd)); + ind = zend_list_insert(im, GD_GLOBAL(le_gd)); RETURN_LONG(ind); } @@ -571,7 +571,7 @@ } } - im = php3_list_find(imgind->value.lval, &ind_type); + im = zend_list_find(imgind->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageGif: unable to find image pointer"); RETURN_FALSE; @@ -598,7 +598,7 @@ RETURN_FALSE; } - output = php3_header(); + output = php_header(); if (output) { gdImageGif (im, tmp); @@ -637,7 +637,7 @@ convert_to_long(imgind); - php3_list_delete(imgind->value.lval); + zend_list_delete(imgind->value.lval); RETURN_TRUE; } @@ -669,7 +669,7 @@ g = green->value.lval; b = blue->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorAllocate: Unable to find image pointer"); RETURN_FALSE; @@ -699,7 +699,7 @@ ind = imgind->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorAt: Unable to find image pointer"); RETURN_FALSE; @@ -743,7 +743,7 @@ g = green->value.lval; b = blue->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorClosest: Unable to find image pointer"); RETURN_FALSE; @@ -771,7 +771,7 @@ ind = imgind->value.lval; col = index->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorDeallocate: Unable to find image pointer"); RETURN_FALSE; @@ -814,7 +814,7 @@ g = green->value.lval; b = blue->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorResolve: Unable to find image pointer"); RETURN_FALSE; @@ -850,7 +850,7 @@ g = green->value.lval; b = blue->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorExact: Unable to find image pointer"); RETURN_FALSE; @@ -887,7 +887,7 @@ g = green->value.lval; b = blue->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorSet: Unable to find image pointer"); RETURN_FALSE; @@ -921,7 +921,7 @@ ind = imgind->value.lval; col = index->value.lval; - im = php3_list_find(ind, &ind_type); + im = zend_list_find(ind, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "ImageColorsForIndex: Unable to find image pointer"); RETURN_FALSE; @@ -967,7 +967,7 @@ y = yarg->value.lval; x = xarg->value.lval; - im = php3_list_find(imarg->value.lval, &ind_type); + im = zend_list_find(imarg->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1009,7 +1009,7 @@ y2 = Y2->value.lval; col = COL->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1048,7 +1048,7 @@ y2 = Y2->value.lval; col = COL->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1089,7 +1089,7 @@ y2 = Y2->value.lval; col = COL->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1130,7 +1130,7 @@ y2 = Y2->value.lval; col = COL->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1181,7 +1181,7 @@ st %= 360; } - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1220,7 +1220,7 @@ y = Y->value.lval; x = X->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1257,7 +1257,7 @@ y = Y->value.lval; x = X->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1282,7 +1282,7 @@ } convert_to_long(IM); - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1320,7 +1320,7 @@ } convert_to_long(IM); - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1363,7 +1363,7 @@ } convert_to_long(IM); - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1402,7 +1402,7 @@ npoints = NPOINTS->value.lval; col = COL->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1505,7 +1505,7 @@ font = gdFontGiant; break; default: - font = php3_list_find(size - 5, &ind_type); + font = zend_list_find(size - 5, &ind_type); if (!font || ind_type != GD_GLOBAL(le_gd_font)) { if (size < 1) { font = gdFontTiny; @@ -1618,7 +1618,7 @@ x = X->value.lval; size = SIZE->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); if (string) { @@ -1719,13 +1719,13 @@ dstX = DX->value.lval; dstY = DY->value.lval; - im_src = php3_list_find(SIM->value.lval, &ind_type); + im_src = zend_list_find(SIM->value.lval, &ind_type); if (!im_src || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; } - im_dst = php3_list_find(DIM->value.lval, &ind_type); + im_dst = zend_list_find(DIM->value.lval, &ind_type); if (!im_dst || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1773,13 +1773,13 @@ dstH = DH->value.lval; dstW = DW->value.lval; - im_src = php3_list_find(SIM->value.lval, &ind_type); + im_src = zend_list_find(SIM->value.lval, &ind_type); if (!im_src || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; } - im_dst = php3_list_find(DIM->value.lval, &ind_type); + im_dst = zend_list_find(DIM->value.lval, &ind_type); if (!im_dst || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1804,7 +1804,7 @@ WRONG_PARAM_COUNT; } - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1827,7 +1827,7 @@ WRONG_PARAM_COUNT; } - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; @@ -1897,7 +1897,7 @@ col = COL->value.lval; y = Y->value.lval; x = X->value.lval; - im = php3_list_find(IM->value.lval, &ind_type); + im = zend_list_find(IM->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; Index: php4/ext/gd/gdt1.c diff -u php4/ext/gd/gdt1.c:1.1 php4/ext/gd/gdt1.c:1.2 --- php4/ext/gd/gdt1.c:1.1 Fri Oct 8 03:56:43 1999 +++ php4/ext/gd/gdt1.c Fri Dec 17 14:51:13 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gdt1.c,v 1.1 1999/10/08 07:56:43 jah Exp $ */ +/* $Id: gdt1.c,v 1.2 1999/12/17 19:51:13 zeev Exp $ */ void _php3_free_ps_font(gd_ps_font *f_ind) { @@ -68,7 +68,7 @@ T1_LoadFont(f_ind->font_id); f_ind->extend = 1; - l_ind = php3_list_insert(f_ind, GD_GLOBAL(le_ps_font)); + l_ind = zend_list_insert(f_ind, GD_GLOBAL(le_ps_font)); RETURN_LONG(l_ind); } /* }}} */ @@ -88,7 +88,7 @@ convert_to_long(fnt); - of_ind = php3_list_find(fnt->value.lval, &type); + 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); @@ -122,7 +122,7 @@ } nf_ind->extend = 1; - l_ind = php3_list_insert(nf_ind, GD_GLOBAL(le_ps_font)); + l_ind = zend_list_insert(nf_ind, GD_GLOBAL(le_ps_font)); RETURN_LONG(l_ind); } */ @@ -140,14 +140,14 @@ convert_to_long(fnt); - php3_list_find(fnt->value.lval, &type); + 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); RETURN_FALSE; } - php3_list_delete(fnt->value.lval); + zend_list_delete(fnt->value.lval); RETURN_TRUE; } /* }}} */ @@ -167,7 +167,7 @@ convert_to_long(fnt); convert_to_string(enc); - f_ind = php3_list_find(fnt->value.lval, &type); + 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); @@ -185,7 +185,7 @@ php3_error(E_WARNING, "Couldn't reencode font"); RETURN_FALSE; } - php3_list_insert(enc_vector, GD_GLOBAL(le_ps_enc)); + zend_list_insert(enc_vector, GD_GLOBAL(le_ps_enc)); RETURN_TRUE; } /* }}} */ @@ -204,7 +204,7 @@ convert_to_long(fnt); convert_to_double(ext); - f_ind = php3_list_find(fnt->value.lval, &type); + 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); @@ -231,7 +231,7 @@ convert_to_long(fnt); convert_to_double(slt); - f_ind = php3_list_find(fnt->value.lval, &type); + 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); @@ -309,14 +309,14 @@ WRONG_PARAM_COUNT; } - bg_img = php3_list_find(img->value.lval, &type); + 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"); RETURN_FALSE; } - f_ind = php3_list_find(fnt->value.lval, &type); + 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); @@ -454,7 +454,7 @@ WRONG_PARAM_COUNT; } - f_ind = php3_list_find(fnt->value.lval, &type); + 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); Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.30 php4/ext/hyperwave/hw.c:1.31 --- php4/ext/hyperwave/hw.c:1.30 Fri Dec 17 14:16:41 1999 +++ php4/ext/hyperwave/hw.c Fri Dec 17 14:51:14 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.30 1999/12/17 19:16:41 zeev Exp $ */ +/* $Id: hw.c,v 1.31 1999/12/17 19:51:14 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -781,7 +781,7 @@ ptr = le->ptr; } - return_value->value.lval = php3_list_insert(ptr,HwSG(le_psocketp)); + return_value->value.lval = zend_list_insert(ptr,HwSG(le_psocketp)); return_value->type = IS_LONG; } else { @@ -800,7 +800,7 @@ RETURN_FALSE; } link = (int) index_ptr->ptr; - ptr = (hw_connection *) php3_list_find(link,&type); /* check if the link is still there */ + ptr = (hw_connection *) zend_list_find(link,&type); /* check if the link is still there */ if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { return_value->value.lval = HwSG(default_link) = link; return_value->type = IS_LONG; @@ -853,7 +853,7 @@ ptr->hostname = strdup(host); ptr->username = strdup("anonymous"); - return_value->value.lval = php3_list_insert(ptr,HwSG(le_socketp)); + return_value->value.lval = zend_list_insert(ptr,HwSG(le_socketp)); return_value->type = IS_LONG; new_index_ptr.ptr = (void *) return_value->value.lval; @@ -921,12 +921,12 @@ } convert_to_long_ex(arg1); id=(*arg1)->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } /* }}} */ @@ -945,7 +945,7 @@ } convert_to_long_ex(arg1); id=(*arg1)->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -977,7 +977,7 @@ } convert_to_long_ex(arg1); id=(*arg1)->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1000,7 +1000,7 @@ } convert_to_long_ex(arg1); id=(*arg1)->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1105,7 +1105,7 @@ } convert_to_long_ex(arg1); link=(*arg1)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); return NULL; @@ -1268,7 +1268,7 @@ link=(*arg1)->value.lval; id=(*arg2)->value.lval; msgid=(*arg3)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1315,7 +1315,7 @@ } link=(*argv[0])->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d", link); RETURN_FALSE; @@ -1389,7 +1389,7 @@ link=arg1->value.lval; objrec=arg2->value.str.val; parms=arg3->value.str.val; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -1420,7 +1420,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1451,7 +1451,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1479,7 +1479,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1512,7 +1512,7 @@ link=arg1->value.lval; id=arg2->value.lval; newobjarr=arg3->value.ht; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1615,7 +1615,7 @@ id=argv[1]->value.lval; remobjarr=argv[2]->value.ht; addobjarr=argv[3]->value.ht; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1846,7 +1846,7 @@ from = 0; break; } - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -1954,7 +1954,7 @@ } link=argv[0]->value.lval; id=argv[1]->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1974,7 +1974,7 @@ doc->attributes = attributes; doc->bodytag = bodytag; doc->size = count; - return_value->value.lval = php3_list_insert(doc,HwSG(le_document)); + return_value->value.lval = zend_list_insert(doc,HwSG(le_document)); return_value->type = IS_LONG; } } @@ -1994,7 +1994,7 @@ convert_to_long(arg1); convert_to_long(arg2); link=arg1->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find socket identifier %d",link); @@ -2002,7 +2002,7 @@ } doc=arg2->value.lval; - docptr = php3_list_find(doc,&type); + docptr = zend_list_find(doc,&type); if(!docptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find document identifier %d", doc); @@ -2037,7 +2037,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2076,7 +2076,7 @@ doc->attributes = attributes; doc->bodytag = NULL; doc->size = count; - return_value->value.lval = php3_list_insert(doc,HwSG(le_document)); + return_value->value.lval = zend_list_insert(doc,HwSG(le_document)); return_value->type = IS_LONG; } } @@ -2098,7 +2098,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2117,7 +2117,7 @@ doc->attributes = attributes; doc->bodytag = NULL; doc->size = count; - return_value->value.lval = php3_list_insert(doc,HwSG(le_document)); + return_value->value.lval = zend_list_insert(doc,HwSG(le_document)); return_value->type = IS_LONG; } } @@ -2138,7 +2138,7 @@ convert_to_string(arg2); link=arg1->value.lval; objrec=arg2->value.str.val; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d", link); RETURN_FALSE; @@ -2205,7 +2205,7 @@ doc->attributes = strdup(objrec); doc->bodytag = NULL; doc->size = strlen(doc->data); - return_value->value.lval = php3_list_insert(doc,HwSG(le_document)); + return_value->value.lval = zend_list_insert(doc,HwSG(le_document)); return_value->type = IS_LONG; } else { if (array_init(return_value) == FAILURE) { @@ -2241,7 +2241,7 @@ convert_to_long(arg2); link = arg1->value.lval; rootid = arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -2281,7 +2281,7 @@ } */ link=argv[0]->value.lval; id=argv[1]->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d", link); RETURN_FALSE; @@ -2314,7 +2314,7 @@ doc->bodytag = bodytag; doc->size = count; /* fprintf(stderr, "size = %d\n", count); */ - return_value->value.lval = php3_list_insert(doc,HwSG(le_document)); + return_value->value.lval = zend_list_insert(doc,HwSG(le_document)); return_value->type = IS_LONG; } } @@ -2341,7 +2341,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2379,7 +2379,7 @@ doc->attributes = attributes; doc->bodytag = NULL; doc->size = count; - return_value->value.lval = php3_list_insert(doc,HwSG(le_document)); + return_value->value.lval = zend_list_insert(doc,HwSG(le_document)); return_value->type = IS_LONG; } } @@ -2406,14 +2406,14 @@ convert_to_long(arg3); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find connection identifier %d",link); RETURN_FALSE; } doc=arg3->value.lval; - docptr = php3_list_find(doc,&type); + docptr = zend_list_find(doc,&type); if(!docptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find document identifier %d",doc); RETURN_FALSE; @@ -2464,7 +2464,7 @@ doc->attributes = strdup(arg1->value.str.val); doc->bodytag = NULL; doc->size = arg3->value.lval; - return_value->value.lval = php3_list_insert(doc,HwSG(le_document)); + return_value->value.lval = zend_list_insert(doc,HwSG(le_document)); return_value->type = IS_LONG; } /* }}} */ @@ -2481,12 +2481,12 @@ } convert_to_long(arg1); id=arg1->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } /* }}} */ @@ -2507,13 +2507,13 @@ } convert_to_long(arg1); id=arg1->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } - if(php3_header()) + if(php_header()) php_write(ptr->data, ptr->size); RETURN_TRUE; @@ -2541,7 +2541,7 @@ convert_to_long(argv[0]); id=argv[0]->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2580,7 +2580,7 @@ convert_to_long(argv[0]); id=argv[0]->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2608,7 +2608,7 @@ convert_to_long(argv[0]); convert_to_string(argv[1]); id=argv[0]->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2642,7 +2642,7 @@ } convert_to_long(arg1); id=arg1->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2668,7 +2668,7 @@ } convert_to_long(arg1); id=arg1->value.lval; - ptr = php3_list_find(id,&type); + ptr = zend_list_find(id,&type); if(!ptr || (type!=HwSG(le_document))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2695,7 +2695,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2729,7 +2729,7 @@ convert_to_long(arg2); link=arg1->value.lval; id=arg2->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2774,7 +2774,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2820,7 +2820,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2854,7 +2854,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2900,7 +2900,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2933,7 +2933,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2964,7 +2964,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -3005,7 +3005,7 @@ query=(*arg2)->value.str.val; maxhits=(*arg3)->value.lval; if (maxhits < 0) maxhits=0x7FFFFFFF; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3048,7 +3048,7 @@ query=(*arg2)->value.str.val; maxhits=(*arg3)->value.lval; if (maxhits < 0) maxhits=0x7FFFFFFF; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3088,7 +3088,7 @@ query=(*arg3)->value.str.val; maxhits=(*arg4)->value.lval; if (maxhits < 0) maxhits=0x7FFFFFFF; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -3133,7 +3133,7 @@ query=(*arg3)->value.str.val; maxhits=(*arg4)->value.lval; if (maxhits < 0) maxhits=0x7FFFFFFF; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -3167,7 +3167,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -3206,7 +3206,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -3241,7 +3241,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -3280,7 +3280,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = (hw_connection *) php3_list_find(link,&type); + ptr = (hw_connection *) zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -3310,7 +3310,7 @@ } convert_to_long_ex(arg1); link = (*arg1)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3339,7 +3339,7 @@ link = (*arg1)->value.lval; name=(*arg2)->value.str.val; passwd=(*arg3)->value.str.val; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3433,7 +3433,7 @@ convert_to_long_ex(arg4); link = (*arg1)->value.lval; retcoll=(*arg4)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3493,7 +3493,7 @@ convert_to_array_ex(arg3); link = (*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3541,7 +3541,7 @@ } link = (*argv[0])->value.lval; id = (*argv[1])->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3573,7 +3573,7 @@ convert_to_long_ex(arg2); link=(*arg1)->value.lval; id=(*arg2)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3607,7 +3607,7 @@ link=(*arg1)->value.lval; servid=(*arg2)->value.lval; id=(*arg3)->value.lval; - ptr = php3_list_find(link,&type); + 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); RETURN_FALSE; @@ -3642,7 +3642,7 @@ rootid=(*arg2)->value.lval; sourceid=(*arg3)->value.lval; destid=(*arg4)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; @@ -3678,7 +3678,7 @@ } convert_to_long_ex(arg1); link=(*arg1)->value.lval; - ptr = php3_list_find(link,&type); + ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; Index: php4/ext/icap/php3_icap.c diff -u php4/ext/icap/php3_icap.c:1.13 php4/ext/icap/php3_icap.c:1.14 --- php4/ext/icap/php3_icap.c:1.13 Sat Dec 4 14:15:50 1999 +++ php4/ext/icap/php3_icap.c Fri Dec 17 14:51:15 1999 @@ -192,7 +192,7 @@ icap_le_struct = emalloc(sizeof(pils)); icap_le_struct->icap_stream = icap_stream; icap_le_struct->flags = 0; - ind = php3_list_insert(icap_le_struct, le_icap); + ind = zend_list_insert(icap_le_struct, le_icap); RETURN_LONG(ind); } @@ -214,7 +214,7 @@ } convert_to_long(streamind); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -224,7 +224,7 @@ flags = options->value.lval; icap_le_struct->flags = flags; } - php3_list_delete(ind); + zend_list_delete(ind); RETURN_TRUE; } /* }}} */ @@ -265,7 +265,7 @@ convert_to_long(streamind); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -305,7 +305,7 @@ ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -334,7 +334,7 @@ convert_to_long(streamind); convert_to_long(eventid); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -411,7 +411,7 @@ if(myargc == 3) convert_to_array(enddate); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -490,7 +490,7 @@ convert_to_string(calendar); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -526,7 +526,7 @@ convert_to_string(dest_calendar); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -564,7 +564,7 @@ convert_to_array(time); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -634,7 +634,7 @@ convert_to_string(calendar); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -669,7 +669,7 @@ convert_to_long(uid); ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -722,7 +722,7 @@ ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -867,7 +867,7 @@ ind = streamind->value.lval; - icap_le_struct = (pils *)php3_list_find(ind, &ind_type); + icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); Index: php4/ext/imap/imap.c diff -u php4/ext/imap/imap.c:1.20 php4/ext/imap/imap.c:1.21 --- php4/ext/imap/imap.c:1.20 Fri Dec 17 13:30:06 1999 +++ php4/ext/imap/imap.c Fri Dec 17 14:51:16 1999 @@ -21,7 +21,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: imap.c,v 1.20 1999/12/17 18:30:06 hholzgra Exp $ */ +/* $Id: imap.c,v 1.21 1999/12/17 19:51:16 zeev Exp $ */ #define IMAP41 @@ -485,7 +485,7 @@ imap_le_struct = emalloc(sizeof(pils)); imap_le_struct->imap_stream = imap_stream; imap_le_struct->flags = cl_flags; - ind = php3_list_insert(imap_le_struct, le_imap); + ind = zend_list_insert(imap_le_struct, le_imap); RETURN_LONG(ind); } @@ -513,7 +513,7 @@ convert_to_long(streamind); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -559,7 +559,7 @@ if (myargc == 4) convert_to_string(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find( ind, &ind_type ); + imap_le_struct = (pils *)zend_list_find( ind, &ind_type ); if ( !imap_le_struct || ind_type != le_imap ) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -591,7 +591,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -617,7 +617,7 @@ convert_to_long( streamind ); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find( ind, &ind_type ); + imap_le_struct = (pils *)zend_list_find( ind, &ind_type ); if ( !imap_le_struct || ind_type != le_imap ) { php_error( E_WARNING, "Unable to find stream pointer" ); RETURN_FALSE; @@ -638,7 +638,7 @@ } convert_to_long(streamind); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -663,7 +663,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -691,7 +691,7 @@ } convert_to_long(streamind); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -706,7 +706,7 @@ } imap_le_struct->flags = flags; } - php3_list_delete(ind); + zend_list_delete(ind); RETURN_TRUE; } /* }}} */ @@ -732,7 +732,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -791,7 +791,7 @@ if(myargc == 3) convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -818,7 +818,7 @@ if (myargcount == 3) convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -846,7 +846,7 @@ if(myargcount == 4) convert_to_long(options); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -878,7 +878,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -908,7 +908,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -939,7 +939,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -969,7 +969,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1003,7 +1003,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1045,7 +1045,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1084,7 +1084,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1125,7 +1125,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1153,7 +1153,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1197,7 +1197,7 @@ if(myargc == 5) convert_to_string(defaulthost); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1522,7 +1522,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1559,7 +1559,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1588,7 +1588,7 @@ convert_to_string(folder); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -1726,7 +1726,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find( ind, &ind_type ); + imap_le_struct = (pils *)zend_list_find( ind, &ind_type ); if ( !imap_le_struct || ind_type != le_imap ) { php_error( E_WARNING, "Unable to find stream pointer" ); @@ -1765,7 +1765,7 @@ if(myargc == 4) convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find( ind, &ind_type ); + imap_le_struct = (pils *)zend_list_find( ind, &ind_type ); if ( !imap_le_struct || ind_type != le_imap ) { php_error( E_WARNING, "Unable to find stream pointer" ); @@ -1873,7 +1873,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if(!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -1988,7 +1988,7 @@ if(myargc==4) convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if(!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -2017,7 +2017,7 @@ convert_to_string(flag); if(myargc==4) convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if(!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -2053,7 +2053,7 @@ if(myargc==4) convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if(!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -2093,7 +2093,7 @@ if(myargc == 3) convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -2120,7 +2120,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -2148,7 +2148,7 @@ ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -2176,7 +2176,7 @@ convert_to_long(flags); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -2224,7 +2224,7 @@ convert_to_string(section); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -2330,7 +2330,7 @@ convert_to_string(sequence); ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || ind_type != le_imap) { php_error(E_WARNING, "Unable to find stream pointer"); @@ -2636,7 +2636,7 @@ } ind = streamind->value.lval; - imap_le_struct = (pils *)php3_list_find(ind, &ind_type); + 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"); RETURN_FALSE; Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.9 php4/ext/interbase/interbase.c:1.10 --- php4/ext/interbase/interbase.c:1.9 Sat Dec 4 14:15:51 1999 +++ php4/ext/interbase/interbase.c Fri Dec 17 14:51:18 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.9 1999/12/04 19:15:51 sas Exp $ */ +/* $Id: interbase.c,v 1.10 1999/12/17 19:51:18 zeev Exp $ */ /* TODO: A lot... */ @@ -360,7 +360,7 @@ db_handle = (isc_db_handle) le->ptr; } - return_value->value.lval = php3_list_insert(db_handle, IBASE_GLOBAL(php3_ibase_module).le_plink); + return_value->value.lval = zend_list_insert(db_handle, IBASE_GLOBAL(php3_ibase_module).le_plink); return_value->type = IS_LONG; } else { list_entry *index_ptr, new_index_ptr; @@ -378,7 +378,7 @@ RETURN_FALSE; } link = (int) index_ptr->ptr; - ptr = php3_list_find(link,&type); /* check if the link is still there */ + ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==IBASE_GLOBAL(php3_ibase_module).le_link || type==IBASE_GLOBAL(php3_ibase_module).le_plink)) { return_value->value.lval = IBASE_GLOBAL(php3_ibase_module).default_link = link; return_value->type = IS_LONG; @@ -401,7 +401,7 @@ } /* add it to the list */ - return_value->value.lval = php3_list_insert(db_handle, IBASE_GLOBAL(php3_ibase_module).le_link); + return_value->value.lval = zend_list_insert(db_handle, IBASE_GLOBAL(php3_ibase_module).le_link); return_value->type = IS_LONG; /* add it to the hash */ @@ -459,13 +459,13 @@ break; } - db_handle = (isc_db_handle) php3_list_find(id, &type); + db_handle = (isc_db_handle) zend_list_find(id, &type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_link && type!=IBASE_GLOBAL(php3_ibase_module).le_plink) { php_error(E_WARNING, "%d is not an InterBase link index",id); RETURN_FALSE; } - php3_list_delete(ibase_link->value.lval); + zend_list_delete(ibase_link->value.lval); RETURN_TRUE; } /* }}} */ @@ -661,7 +661,7 @@ break; } - db_handle = (isc_db_handle) php3_list_find(id, &type); + db_handle = (isc_db_handle) zend_list_find(id, &type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_link && type!=IBASE_GLOBAL(php3_ibase_module).le_plink) { php_error(E_WARNING, "%d is not an InterBase link index", id); RETURN_FALSE; @@ -691,7 +691,7 @@ ibase_result->sqlda = osqlda; ibase_result->trans = tr_handle; ibase_result->commitok = 1; - return_value->value.lval = php3_list_insert(ibase_result, php3_ibase_module.le_result); + return_value->value.lval = zend_list_insert(ibase_result, php3_ibase_module.le_result); return_value->type = IS_LONG; } else { if (status[0] == 1 && status[1]) { @@ -737,7 +737,7 @@ } convert_to_long(result); - ibase_result = (ibase_result_handle *) php3_list_find(result->value.lval, &type); + ibase_result = (ibase_result_handle *) zend_list_find(result->value.lval, &type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_result) { php_error(E_WARNING,"%d is not an InterBase result index", result->value.lval); @@ -890,13 +890,13 @@ RETURN_FALSE; } - ibase_result = (ibase_result_handle *) php3_list_find(result->value.lval,&type); + ibase_result = (ibase_result_handle *) zend_list_find(result->value.lval,&type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_result) { php_error(E_WARNING,"%d is not an InterBase result index",result->value.lval); RETURN_FALSE; } - php3_list_delete(result->value.lval); + zend_list_delete(result->value.lval); RETURN_TRUE; } /* }}} */ @@ -934,7 +934,7 @@ break; } - db_handle = (isc_db_handle) php3_list_find(id, &type); + db_handle = (isc_db_handle) zend_list_find(id, &type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_link && type!=IBASE_GLOBAL(php3_ibase_module).le_plink) { php_error(E_WARNING, "%d is not an InterBase link index", id); RETURN_FALSE; @@ -955,7 +955,7 @@ ibase_query->sqlda = isqlda; ibase_query->trans = tr_handle; ibase_query->alloced = 0; - return_value->value.lval = php3_list_insert(ibase_query, php3_ibase_module.le_query); + return_value->value.lval = zend_list_insert(ibase_query, php3_ibase_module.le_query); return_value->type = IS_LONG; } /* }}} */ @@ -978,7 +978,7 @@ RETURN_FALSE; } - ibase_query = (ibase_query_handle *) php3_list_find(query->value.lval,&type); + ibase_query = (ibase_query_handle *) zend_list_find(query->value.lval,&type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_query) { php_error(E_WARNING,"%d is not an InterBase query index",query->value.lval); @@ -1041,7 +1041,7 @@ RETURN_FALSE; } - ibase_query = (ibase_query_handle *) php3_list_find(query->value.lval,&type); + ibase_query = (ibase_query_handle *) zend_list_find(query->value.lval,&type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_query) { php_error(E_WARNING,"%d is not an InterBase query index", query->value.lval); @@ -1052,7 +1052,7 @@ ibase_result = (ibase_result_handle *) emalloc(sizeof(ibase_result_handle)); ibase_result->result = ibase_query->query; ibase_result->sqlda = osqlda; - return_value->value.lval = php3_list_insert(ibase_result, IBASE_GLOBAL(php3_ibase_module).le_result); + return_value->value.lval = zend_list_insert(ibase_result, IBASE_GLOBAL(php3_ibase_module).le_result); return_value->type = IS_LONG; } /* }}} */ @@ -1075,13 +1075,13 @@ RETURN_FALSE; } - ibase_query = (ibase_query_handle *) php3_list_find(query->value.lval, &type); + ibase_query = (ibase_query_handle *) zend_list_find(query->value.lval, &type); if (type!=IBASE_GLOBAL(php3_ibase_module).le_query) { php_error(E_WARNING,"%d is not an InterBase query index", query->value.lval); RETURN_FALSE; } - php3_list_delete(query->value.lval); + zend_list_delete(query->value.lval); RETURN_TRUE; } /* }}} */ Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.3 php4/ext/java/java.c:1.4 --- php4/ext/java/java.c:1.3 Mon Nov 29 10:36:22 1999 +++ php4/ext/java/java.c Fri Dec 17 14:51:19 1999 @@ -227,7 +227,7 @@ case IS_OBJECT: zend_hash_index_find(argv[i]->value.obj.properties, 0, (void*)&handle); - arg = php3_list_find((*handle)->value.lval, &type); + arg = zend_list_find((*handle)->value.lval, &type); break; case IS_BOOL: @@ -323,7 +323,7 @@ jmethodID invoke = (*jenv)->GetStaticMethodID(jenv, php_reflect, "Invoke", "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;J)V"); zend_hash_index_find(object->value.obj.properties, 0, (void**) &handle); - obj = php3_list_find((*handle)->value.lval, &type); + obj = zend_list_find((*handle)->value.lval, &type); method = (*jenv)->NewStringUTF(jenv, function_name->element.value.str.val); (pval*)(long)result = return_value; @@ -360,7 +360,7 @@ /* get the object */ zend_hash_index_find(property_reference->object->value.obj.properties, 0, (void **) &pobject); - obj = php3_list_find((*pobject)->value.lval,&type); + obj = zend_list_find((*pobject)->value.lval,&type); (pval*)(long)result = &presult; var_uninit(&presult); @@ -503,7 +503,7 @@ handle = (pval *) emalloc(sizeof(pval)); handle->type = IS_LONG; handle->value.lval = - php3_list_insert((*jenv)->NewGlobalRef(jenv,value), le_jobject); + zend_list_insert((*jenv)->NewGlobalRef(jenv,value), le_jobject); pval_copy_constructor(handle); INIT_PZVAL(handle); zend_hash_index_update(presult->value.obj.properties, 0, Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.17 php4/ext/ldap/ldap.c:1.18 --- php4/ext/ldap/ldap.c:1.17 Thu Dec 9 18:45:29 1999 +++ php4/ext/ldap/ldap.c Fri Dec 17 14:51:19 1999 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.17 1999/12/09 23:45:29 andrei Exp $ */ +/* $Id: ldap.c,v 1.18 1999/12/17 19:51:19 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -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.17 1999/12/09 23:45:29 andrei Exp $</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" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" @@ -368,7 +368,7 @@ if ( ldap == NULL ) { RETURN_FALSE; } else { - RETURN_LONG(php3_list_insert((void*)ldap,LDAP_GLOBAL(le_link))); + RETURN_LONG(zend_list_insert((void*)ldap,LDAP_GLOBAL(le_link))); } } @@ -382,7 +382,7 @@ LDAP_TLS_VARS; convert_to_long_ex(link); - ldap = (LDAP *) php3_list_find((*link)->value.lval, &type); + ldap = (LDAP *) zend_list_find((*link)->value.lval, &type); if (!ldap || !(type == LDAP_GLOBAL(le_link))) { php_error(E_WARNING, "%d is not a LDAP link index",(*link)->value.lval); @@ -399,7 +399,7 @@ LDAP_TLS_VARS; convert_to_long_ex(result); - ldap_result = (LDAPMessage *)php3_list_find((*result)->value.lval, &type); + ldap_result = (LDAPMessage *)zend_list_find((*result)->value.lval, &type); if (!ldap_result || type != LDAP_GLOBAL(le_result)) { php_error(E_WARNING, "%d is not a LDAP result index",(*result)->value.lval); @@ -417,7 +417,7 @@ LDAP_TLS_VARS; convert_to_long_ex(result); - ldap_result_entry = (LDAPMessage *)php3_list_find((*result)->value.lval, &type); + ldap_result_entry = (LDAPMessage *)zend_list_find((*result)->value.lval, &type); if (!ldap_result_entry || type != LDAP_GLOBAL(le_result_entry)) { php_error(E_WARNING, "%d is not a LDAP result entry index", (*result)->value.lval); @@ -435,7 +435,7 @@ LDAP_TLS_VARS; convert_to_long_ex(berp); - ber = (BerElement *) php3_list_find((*berp)->value.lval, &type); + ber = (BerElement *) zend_list_find((*berp)->value.lval, &type); if ( type != LDAP_GLOBAL(le_ber_entry)) { php_error(E_WARNING, "%d is not a BerElement index",(*berp)->value.lval); @@ -454,7 +454,7 @@ WRONG_PARAM_COUNT; } - php3_list_delete((*berp)->value.lval); + zend_list_delete((*berp)->value.lval); RETURN_TRUE; } #endif @@ -531,7 +531,7 @@ ldap = _get_ldap_link(link, list); if (ldap == NULL) RETURN_FALSE; - php3_list_delete((*link)->value.lval); + zend_list_delete((*link)->value.lval); RETURN_TRUE; } /* }}} */ @@ -628,7 +628,7 @@ #endif RETVAL_FALSE; } else { - RETVAL_LONG(php3_list_insert(ldap_result, LDAP_GLOBAL(le_result))); + RETVAL_LONG(zend_list_insert(ldap_result, LDAP_GLOBAL(le_result))); } if (ldap_attrs != NULL) { @@ -678,7 +678,7 @@ if (ldap_result == NULL) { RETVAL_FALSE; } else { - php3_list_delete((*result)->value.lval); /* Delete list entry and call registered destructor function */ + zend_list_delete((*result)->value.lval); /* Delete list entry and call registered destructor function */ RETVAL_TRUE; } return; @@ -730,7 +730,7 @@ if ((ldap_result_entry = ldap_first_entry(ldap, ldap_result)) == NULL) { RETURN_FALSE; } else { - RETURN_LONG(php3_list_insert(ldap_result_entry, LDAP_GLOBAL(le_result_entry))); + RETURN_LONG(zend_list_insert(ldap_result_entry, LDAP_GLOBAL(le_result_entry))); } } /* }}} */ @@ -757,7 +757,7 @@ if ((ldap_result_entry_next = ldap_next_entry(ldap, ldap_result_entry)) == NULL) { RETURN_FALSE; } else { - RETURN_LONG(php3_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result_entry))); + RETURN_LONG(zend_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result_entry))); } } /* }}} */ @@ -875,7 +875,7 @@ } else { /* brep is passed by ref so we do not have to account for memory */ (*berp)->type=IS_LONG; - (*berp)->value.lval=php3_list_insert(ber,LDAP_GLOBAL(le_ber_entry)); + (*berp)->value.lval=zend_list_insert(ber,LDAP_GLOBAL(le_ber_entry)); RETVAL_STRING(attribute,1); #ifdef WINDOWS Index: php4/ext/mcal/php3_mcal.c diff -u php4/ext/mcal/php3_mcal.c:1.9 php4/ext/mcal/php3_mcal.c:1.10 --- php4/ext/mcal/php3_mcal.c:1.9 Tue Dec 14 01:22:40 1999 +++ php4/ext/mcal/php3_mcal.c Fri Dec 17 14:51:20 1999 @@ -276,7 +276,7 @@ mcal_le_struct->mcal_stream = mcal_stream; mcal_le_struct->event=calevent_new(); - ind = php3_list_insert(mcal_le_struct, le_mcal); + ind = zend_list_insert(mcal_le_struct, le_mcal); RETURN_LONG(ind); } @@ -298,7 +298,7 @@ } convert_to_long(streamind); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -308,7 +308,7 @@ flags = options->value.lval; mcal_le_struct->flags = flags; } - php3_list_delete(ind); + zend_list_delete(ind); RETURN_TRUE; } /* }}} */ @@ -349,7 +349,7 @@ convert_to_long(streamind); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -386,7 +386,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -415,7 +415,7 @@ convert_to_long(streamind); convert_to_long(eventid); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -449,7 +449,7 @@ } convert_to_long(streamind); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -554,7 +554,7 @@ convert_to_long(streamind); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -615,7 +615,7 @@ convert_to_string(calendar); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -651,7 +651,7 @@ convert_to_string(dest_calendar); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -688,7 +688,7 @@ convert_to_long(streamind); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -743,7 +743,7 @@ convert_to_string(calendar); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -778,7 +778,7 @@ convert_to_long(uid); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; @@ -819,7 +819,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -856,7 +856,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -895,7 +895,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -923,7 +923,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -951,7 +951,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -985,7 +985,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1027,7 +1027,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1062,7 +1062,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1089,7 +1089,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1124,7 +1124,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1323,7 +1323,7 @@ convert_to_array(next); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1407,7 +1407,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1446,7 +1446,7 @@ convert_to_long(weekdays); ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1485,7 +1485,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1524,7 +1524,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); @@ -1563,7 +1563,7 @@ ind = streamind->value.lval; - mcal_le_struct = (pils *)php3_list_find(ind, &ind_type); + mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { php3_error(E_WARNING, "Unable to find stream pointer"); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.44 php4/ext/oci8/oci8.c:1.45 --- php4/ext/oci8/oci8.c:1.44 Fri Dec 17 14:16:45 1999 +++ php4/ext/oci8/oci8.c Fri Dec 17 14:51:23 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.44 1999/12/17 19:16:45 zeev Exp $ */ +/* $Id: oci8.c,v 1.45 1999/12/17 19:51:23 zeev Exp $ */ /* TODO list: * @@ -704,7 +704,7 @@ vsnprintf(buffer, sizeof(buffer)-1, format, args); va_end(args); buffer[sizeof(buffer)-1] = '\0'; - if (php3_header()) { + if (php_header()) { php_printf("OCIDebug: %s<br>\n", buffer); } } @@ -2765,7 +2765,7 @@ goto bail; } } else { - if (php3_header()) { + if (php_header()) { PHPWRITE(buffer,toread); } } Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.9 php4/ext/odbc/velocis.c:1.10 --- php4/ext/odbc/velocis.c:1.9 Sat Dec 4 14:15:57 1999 +++ php4/ext/odbc/velocis.c Fri Dec 17 14:51:24 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.9 1999/12/04 19:15:57 sas Exp $ */ +/* $Id: velocis.c,v 1.10 1999/12/17 19:51:24 zeev Exp $ */ /* * TODO: @@ -131,7 +131,7 @@ { int ind; - ind = php3_list_insert(conn,php3_velocis_module.le_link); + ind = zend_list_insert(conn,php3_velocis_module.le_link); conn->hdbc = hdbc; conn->index = ind; @@ -144,7 +144,7 @@ VConn *conn; int type; - conn = php3_list_find(ind,&type); + conn = zend_list_find(ind,&type); if ( !conn || type != php3_velocis_module.le_link ) { return(NULL); } @@ -154,7 +154,7 @@ static void velocis_del_conn(HashTable *list,int ind) { - php3_list_delete(ind); + zend_list_delete(ind); } static int @@ -162,7 +162,7 @@ { int ind; - ind = php3_list_insert(res,php3_velocis_module.le_result); + ind = zend_list_insert(res,php3_velocis_module.le_result); res->conn = conn; res->index = ind; @@ -175,7 +175,7 @@ Vresult *res; int type; - res = php3_list_find(ind,&type); + res = zend_list_find(ind,&type); if ( !res || type != php3_velocis_module.le_result ) { return(NULL); } @@ -185,7 +185,7 @@ static void velocis_del_result(HashTable *list,int ind) { - php3_list_delete(ind); + zend_list_delete(ind); } /* Users functions */ Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.17 php4/ext/pdf/pdf.c:1.18 --- php4/ext/pdf/pdf.c:1.17 Sat Dec 4 14:16:00 1999 +++ php4/ext/pdf/pdf.c Fri Dec 17 14:51:25 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.17 1999/12/04 19:16:00 sas Exp $ */ +/* $Id: pdf.c,v 1.18 1999/12/17 19:51:25 zeev Exp $ */ /* pdflib 2.01 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -222,7 +222,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -252,7 +252,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -282,7 +282,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -312,7 +312,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -342,7 +342,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -376,7 +376,7 @@ if (0 > PDF_open_fp(pdf, fp)) { RETURN_FALSE; } - id = php3_list_insert(pdf,PDF_GLOBAL(le_pdf)); + id = zend_list_insert(pdf,PDF_GLOBAL(le_pdf)); RETURN_LONG(id); } /* }}} */ @@ -395,13 +395,13 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } @@ -426,7 +426,7 @@ id=arg1->value.lval; height = arg2->value.dval; width = arg3->value.dval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -452,7 +452,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -479,7 +479,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -508,7 +508,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -551,7 +551,7 @@ convert_to_double(arg3); convert_to_long(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -608,7 +608,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -635,7 +635,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -662,7 +662,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -689,7 +689,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -716,7 +716,7 @@ convert_to_long(arg1); convert_to_long(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -743,7 +743,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -770,7 +770,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -801,7 +801,7 @@ convert_to_array(arg2); id=arg1->value.lval; matrix=arg2->value.ht; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -850,7 +850,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -877,7 +877,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -904,7 +904,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -931,7 +931,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -959,7 +959,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -985,7 +985,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1011,7 +1011,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1039,7 +1039,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1067,7 +1067,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1094,7 +1094,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1121,7 +1121,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1153,7 +1153,7 @@ convert_to_long(arg1); convert_to_long(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1185,7 +1185,7 @@ convert_to_long(arg1); convert_to_long(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1217,7 +1217,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1249,7 +1249,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1277,7 +1277,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1305,7 +1305,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1337,7 +1337,7 @@ convert_to_double(arg6); convert_to_double(arg7); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1370,7 +1370,7 @@ convert_to_double(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1399,7 +1399,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1430,7 +1430,7 @@ convert_to_double(arg5); convert_to_double(arg6); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1460,7 +1460,7 @@ convert_to_double(arg4); convert_to_double(arg5); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1489,7 +1489,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1515,7 +1515,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1541,7 +1541,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1567,7 +1567,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1593,7 +1593,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1619,7 +1619,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1645,7 +1645,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1671,7 +1671,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1698,7 +1698,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1725,7 +1725,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1752,7 +1752,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1781,7 +1781,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1810,7 +1810,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1839,7 +1839,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1883,7 +1883,7 @@ convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find document identifier %d",id); RETURN_FALSE; @@ -1894,7 +1894,7 @@ id = arg3->value.lval; if (id > 0) { - parent = php3_list_find(id, &type); + parent = zend_list_find(id, &type); if (!parent || (type != PDF_GLOBAL(le_outline))) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -1918,7 +1918,7 @@ outline=emalloc(sizeof(int)); *outline = PDF_add_bookmark(pdf, arg2->value.str.val, parentid, open); - id = php3_list_insert(outline,PDF_GLOBAL(le_outline)); + id = zend_list_insert(outline,PDF_GLOBAL(le_outline)); RETURN_LONG(id); } /* }}} */ @@ -1938,7 +1938,7 @@ convert_to_long(arg1); convert_to_long(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -1993,7 +1993,7 @@ convert_to_long(arg1); convert_to_double(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2021,7 +2021,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2034,7 +2034,7 @@ RETURN_FALSE; } - id = php3_list_insert((void *) pdf_image,PDF_GLOBAL(le_pdf_image)); + id = zend_list_insert((void *) pdf_image,PDF_GLOBAL(le_pdf_image)); RETURN_LONG(id); } /* }}} */ @@ -2055,7 +2055,7 @@ convert_to_long(arg1); convert_to_string(arg2); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2068,7 +2068,7 @@ RETURN_FALSE; } - id = php3_list_insert((void *) pdf_image,PDF_GLOBAL(le_pdf_image)); + id = zend_list_insert((void *) pdf_image,PDF_GLOBAL(le_pdf_image)); RETURN_LONG(id); } /* }}} */ @@ -2092,7 +2092,7 @@ convert_to_long(argv[0]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2100,7 +2100,7 @@ convert_to_long(argv[1]); gid=argv[1]->value.lval; - im = php3_list_find(gid, &type); + im = zend_list_find(gid, &type); if (!im || type != phpi_get_le_gd()) { php3_error(E_WARNING, "pdf: Unable to find image pointer"); RETURN_FALSE; @@ -2134,7 +2134,7 @@ RETURN_FALSE; } - id = php3_list_insert((void *) pdf_image,PDF_GLOBAL(le_pdf_image)); + id = zend_list_insert((void *) pdf_image,PDF_GLOBAL(le_pdf_image)); RETURN_LONG(id); } /* }}} */ @@ -2155,7 +2155,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2163,7 +2163,7 @@ convert_to_long(arg2); id=arg2->value.lval; - pdf_image = (int) php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -2190,7 +2190,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2198,7 +2198,7 @@ convert_to_long(arg2); id=arg2->value.lval; - pdf_image = (int) php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -2232,7 +2232,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2240,7 +2240,7 @@ convert_to_long(arg2); id=arg2->value.lval; - pdf_image = (int) php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -2271,7 +2271,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2279,7 +2279,7 @@ convert_to_long(arg2); id=arg2->value.lval; - pdf_image = (int) php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -2311,7 +2311,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2319,7 +2319,7 @@ convert_to_long(arg2); id=arg2->value.lval; - pdf_image = (int) php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -2347,7 +2347,7 @@ convert_to_long(arg1); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; @@ -2355,7 +2355,7 @@ convert_to_long(arg2); id=arg2->value.lval; - pdf_image = (int) php3_list_find(id,&type); + 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); RETURN_FALSE; @@ -2386,7 +2386,7 @@ convert_to_double(arg5); convert_to_string(arg6); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2419,7 +2419,7 @@ convert_to_long(arg7); convert_to_string(arg8); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2447,7 +2447,7 @@ convert_to_string(arg2); convert_to_double(arg3); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2476,7 +2476,7 @@ convert_to_double(arg3); convert_to_double(arg4); id=arg1->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; @@ -2510,7 +2510,7 @@ convert_to_string(argv[5]); convert_to_string(argv[6]); id=argv[0]->value.lval; - pdf = php3_list_find(id,&type); + pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { php3_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.29 php4/ext/pgsql/pgsql.c:1.30 --- php4/ext/pgsql/pgsql.c:1.29 Sun Dec 5 11:25:29 1999 +++ php4/ext/pgsql/pgsql.c Fri Dec 17 14:51:27 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.29 1999/12/05 16:25:29 sas Exp $ */ +/* $Id: pgsql.c,v 1.30 1999/12/17 19:51:27 zeev Exp $ */ #include <stdlib.h> @@ -314,7 +314,7 @@ } pgsql = (PGconn *) le->ptr; } - return_value->value.lval = php3_list_insert(pgsql,le_plink); + return_value->value.lval = zend_list_insert(pgsql,le_plink); return_value->type = IS_LONG; } else { list_entry *index_ptr,new_index_ptr; @@ -332,7 +332,7 @@ RETURN_FALSE; } link = (int) (long) index_ptr->ptr; - ptr = php3_list_find(link,&type); /* check if the link is still there */ + ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==le_link || type==le_plink)) { return_value->value.lval = PGG(default_link) = link; return_value->type = IS_LONG; @@ -359,7 +359,7 @@ } /* add it to the list */ - return_value->value.lval = php3_list_insert(pgsql,le_link); + return_value->value.lval = zend_list_insert(pgsql,le_link); return_value->type = IS_LONG; /* add it to the hash */ @@ -429,13 +429,13 @@ break; } - pgsql = (PGconn *) php3_list_find(id,&type); + pgsql = (PGconn *) zend_list_find(id,&type); if (type!=le_link && type!=le_plink) { php_error(E_WARNING,"%d is not a PostgresSQL link index",id); RETURN_FALSE; } - php3_list_delete(pgsql_link->value.lval); + zend_list_delete(pgsql_link->value.lval); RETURN_TRUE; } /* }}} */ @@ -471,7 +471,7 @@ break; } - pgsql = (PGconn *) php3_list_find(id,&type); + pgsql = (PGconn *) zend_list_find(id,&type); if (type!=le_link && type!=le_plink) { php_error(E_WARNING,"%d is not a PostgresSQL link index",id); RETURN_FALSE; @@ -583,7 +583,7 @@ break; } - pgsql = (PGconn *) php3_list_find(id,&type); + pgsql = (PGconn *) zend_list_find(id,&type); if (type!=le_link && type!=le_plink) { php_error(E_WARNING,"%d is not a PostgresSQL link index",id); RETURN_FALSE; @@ -613,7 +613,7 @@ pg_result = (pgsql_result_handle *) emalloc(sizeof(pgsql_result_handle)); pg_result->conn = pgsql; pg_result->result = pgsql_result; - return_value->value.lval = php3_list_insert(pg_result,le_result); + return_value->value.lval = zend_list_insert(pg_result,le_result); return_value->type = IS_LONG; } else { RETURN_FALSE; @@ -639,7 +639,7 @@ } convert_to_long(result); - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); @@ -756,7 +756,7 @@ } convert_to_long(result); - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); @@ -830,7 +830,7 @@ } convert_to_long(result); - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); @@ -858,7 +858,7 @@ } convert_to_long(result); - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); @@ -926,7 +926,7 @@ } convert_to_long(result); - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); @@ -1017,7 +1017,7 @@ } convert_to_long(result); - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); @@ -1087,13 +1087,13 @@ if (result->value.lval==0) { RETURN_FALSE; } - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); RETURN_FALSE; } - php3_list_delete(result->value.lval); + zend_list_delete(result->value.lval); RETURN_TRUE; } /* }}} */ @@ -1112,7 +1112,7 @@ } convert_to_long(result); - pg_result = (pgsql_result_handle *) php3_list_find(result->value.lval,&type); + pg_result = (pgsql_result_handle *) zend_list_find(result->value.lval,&type); if (type!=le_result) { php_error(E_WARNING,"%d is not a PostgresSQL result index",result->value.lval); @@ -1156,7 +1156,7 @@ break; } - pgsql = (PGconn *) php3_list_find(id,&type); + pgsql = (PGconn *) zend_list_find(id,&type); if (type!=le_link && type!=le_plink) { php_error(E_WARNING,"%d is not a PostgresSQL link index",id); RETURN_FALSE; @@ -1213,7 +1213,7 @@ break; } - pgsql = (PGconn *) php3_list_find(id,&type); + pgsql = (PGconn *) zend_list_find(id,&type); if (type!=le_link && type!=le_plink) { php_error(E_WARNING,"%d is not a PostgresSQL link index",id); RETURN_FALSE; @@ -1267,7 +1267,7 @@ break; } - pgsql = (PGconn *) php3_list_find(id,&type); + pgsql = (PGconn *) zend_list_find(id,&type); if (type!=le_link && type!=le_plink) { php_error(E_WARNING,"%d is not a PostgresSQL link index",id); RETURN_FALSE; @@ -1314,7 +1314,7 @@ } else { pgsql_lofp->conn = pgsql; pgsql_lofp->lofd = pgsql_lofd; - return_value->value.lval = php3_list_insert(pgsql_lofp, le_lofp); + return_value->value.lval = zend_list_insert(pgsql_lofp, le_lofp); return_value->type = IS_LONG; } } @@ -1326,7 +1326,7 @@ } else { pgsql_lofp->conn = pgsql; pgsql_lofp->lofd = pgsql_lofd; - return_value->value.lval = php3_list_insert(pgsql_lofp, le_lofp); + return_value->value.lval = zend_list_insert(pgsql_lofp, le_lofp); return_value->type = IS_LONG; } } @@ -1353,7 +1353,7 @@ break; } - pgsql = (pgLofp *) php3_list_find(id,&type); + pgsql = (pgLofp *) zend_list_find(id,&type); if (type!=le_lofp) { php_error(E_WARNING,"%d is not a PostgresSQL large object index",id); RETURN_FALSE; @@ -1365,7 +1365,7 @@ } else { RETVAL_TRUE; } - php3_list_delete(id); + zend_list_delete(id); return; } /* }}} */ @@ -1394,7 +1394,7 @@ break; } - pgsql = (pgLofp *) php3_list_find(id,&type); + pgsql = (pgLofp *) zend_list_find(id,&type); if (type!=le_lofp) { php_error(E_WARNING,"%d is not a PostgresSQL large object index",id); RETURN_FALSE; @@ -1436,7 +1436,7 @@ break; } - pgsql = (pgLofp *) php3_list_find(id,&type); + pgsql = (pgLofp *) zend_list_find(id,&type); if (type!=le_lofp) { php_error(E_WARNING,"%d is not a PostgresSQL large object index",id); RETURN_FALSE; @@ -1475,7 +1475,7 @@ break; } - pgsql = (pgLofp *) php3_list_find(id,&type); + pgsql = (pgLofp *) zend_list_find(id,&type); if (type!=le_lofp) { php_error(E_WARNING,"%d is not a PostgresSQL large object index",id); RETURN_FALSE; Index: php4/ext/standard/base64.c diff -u php4/ext/standard/base64.c:1.9 php4/ext/standard/base64.c:1.10 --- php4/ext/standard/base64.c:1.9 Fri Sep 24 15:35:25 1999 +++ php4/ext/standard/base64.c Fri Dec 17 14:51:29 1999 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.c,v 1.9 1999/09/24 19:35:25 sas Exp $ */ +/* $Id: base64.c,v 1.10 1999/12/17 19:51:29 zeev Exp $ */ #include <string.h> @@ -31,7 +31,7 @@ }; static char base64_pad = '='; -unsigned char *_php3_base64_encode(const unsigned char *string, int length, int *ret_length) { +unsigned char *php_base64_encode(const unsigned char *string, int length, int *ret_length) { const unsigned char *current = string; int i = 0; unsigned char *result = (unsigned char *)emalloc(((length + 3 - length % 3) * 4 / 3 + 1) * sizeof(char)); @@ -150,7 +150,7 @@ WRONG_PARAM_COUNT; } convert_to_string_ex(string); - result = _php3_base64_encode((*string)->value.str.val, (*string)->value.str.len, &ret_length); + result = php_base64_encode((*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.2 php4/ext/standard/base64.h:1.3 --- php4/ext/standard/base64.h:1.2 Sun May 16 07:19:25 1999 +++ php4/ext/standard/base64.h Fri Dec 17 14:51:29 1999 @@ -26,7 +26,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.h,v 1.2 1999/05/16 11:19:25 sas Exp $ */ +/* $Id: base64.h,v 1.3 1999/12/17 19:51:29 zeev Exp $ */ #ifndef _BASE64_h #define _BASE64_h @@ -34,7 +34,7 @@ PHP_FUNCTION(base64_decode); PHP_FUNCTION(base64_encode); -extern unsigned char *_php3_base64_encode(const unsigned char *, int, int *); +extern unsigned char *php_base64_encode(const unsigned char *, int, int *); extern unsigned char *_php3_base64_decode(const unsigned char *, int, int *); #endif /* _BASE64_h */ Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.19 php4/ext/standard/dir.c:1.20 --- php4/ext/standard/dir.c:1.19 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/dir.c Fri Dec 17 14:51:29 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.19 1999/12/17 19:16:47 zeev Exp $ */ +/* $Id: dir.c,v 1.20 1999/12/17 19:51:29 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -209,7 +209,7 @@ FETCH_DIRP(); - php3_list_delete(dirp->id); + zend_list_delete(dirp->id); } /* }}} */ Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.48 php4/ext/standard/file.c:1.49 --- php4/ext/standard/file.c:1.48 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/file.c Fri Dec 17 14:51:29 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.48 1999/12/17 19:16:47 zeev Exp $ */ +/* $Id: file.c,v 1.49 1999/12/17 19:51:29 zeev Exp $ */ /* Synced with php3 revision 1.218 1999-06-16 [ssb] */ @@ -700,7 +700,7 @@ what = zend_fetch_resource(arg1,-1,"File-Handle",&type,2,le_fopen,le_socket); ZEND_VERIFY_RESOURCE(what); - php3_list_delete((*arg1)->value.lval); + zend_list_delete((*arg1)->value.lval); RETURN_TRUE; } @@ -776,7 +776,7 @@ what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,1,le_popen); ZEND_VERIFY_RESOURCE(what); - php3_list_delete((*arg1)->value.lval); + zend_list_delete((*arg1)->value.lval); RETURN_LONG(FIL(pclose_ret)); } @@ -888,7 +888,7 @@ convert_to_long(socket); convert_to_long(timeout); - sock = php3_list_find(socket->value.lval, &type); + sock = zend_list_find(socket->value.lval, &type); if (type!=le_socket) { php_error(E_WARNING,"%d is not a socket id",socket->value.lval); RETURN_FALSE; @@ -1337,7 +1337,7 @@ } RETURN_FALSE; } - if (php3_header()) { + if (php_header()) { size = php_passthru_fd(socketd, fp, issock); } if (issock) { @@ -1400,11 +1400,11 @@ } size = 0; - if (php3_header()) { /* force headers if not already sent */ + if (php_header()) { /* force headers if not already sent */ size = php_passthru_fd(socketd, (FILE*) what, issock); } - php3_list_delete((*arg1)->value.lval); + zend_list_delete((*arg1)->value.lval); RETURN_LONG(size); } Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.31 php4/ext/standard/fsock.c:1.32 --- php4/ext/standard/fsock.c:1.31 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/fsock.c Fri Dec 17 14:51:29 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.31 1999/12/17 19:16:47 zeev Exp $ */ +/* $Id: fsock.c,v 1.32 1999/12/17 19:51:29 zeev Exp $ */ /* Synced with php3 revision 1.121 1999-06-18 [ssb] */ /* Synced with php3 revision 1.133 1999-07-21 [sas] */ @@ -444,7 +444,7 @@ return sock; } -size_t _php3_sock_set_def_chunk_size(size_t size) +size_t php_sock_set_def_chunk_size(size_t size) { size_t old; FLS_FETCH(); Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.18 php4/ext/standard/fsock.h:1.19 --- php4/ext/standard/fsock.h:1.18 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/fsock.h Fri Dec 17 14:51:29 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.18 1999/12/17 19:16:47 zeev Exp $ */ +/* $Id: fsock.h,v 1.19 1999/12/17 19:51:29 zeev Exp $ */ /* Synced with php3 revision 1.24 1999-06-18 [ssb] */ @@ -69,7 +69,7 @@ int _php3_sock_set_blocking(int socket, int mode); int _php3_sock_destroy(int socket); int php_sock_close(int socket); -size_t _php3_sock_set_def_chunk_size(size_t size); +size_t php_sock_set_def_chunk_size(size_t size); int php_msock_destroy(int *data); PHPAPI int connect_nonb(int sockfd, struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout); Index: php4/ext/standard/head.c diff -u php4/ext/standard/head.c:1.19 php4/ext/standard/head.c:1.20 --- php4/ext/standard/head.c:1.19 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/head.c Fri Dec 17 14:51:29 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.19 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: head.c,v 1.20 1999/12/17 19:51:29 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -104,7 +104,7 @@ rr = r + 1; } if (PG(safe_mode) && (!strcasecmp(header_information, "WWW-authenticate"))) { - myuid = _php3_getuid(); + myuid = php_getuid(); sprintf(temp2, "realm=\"%ld ", myuid); /* SAFE */ temp = _php3_regreplace("realm=\"", temp2, rr, 1, 0); if (!strcmp(temp, rr)) { @@ -214,16 +214,16 @@ #if 0 /* - * php3_header() flushes the header info built up using calls to + * php_header() flushes the header info built up using calls to * the Header() function. If type is 1, a redirect to str is done. * Otherwise type should be 0 and str NULL. * * The function returns non-zero if output is allowed after the - * call, and zero otherwise. Any call to php3_header() must check + * call, and zero otherwise. Any call to php_header() must check * the return status and if false, no output must be sent. This * is in order to correctly handle HEAD requests. */ -PHPAPI int php3_header(void) +PHPAPI int php_header(void) { #if APACHE CookieList *cookie; @@ -379,7 +379,7 @@ return(1); } #else -PHPAPI int php3_header() +PHPAPI int php_header() { SLS_FETCH(); @@ -548,7 +548,7 @@ } -int php3_headers_unsent(void) +int php_headers_unsent(void) { if (php3_HeaderPrinted!=1 || !php3_PrintHeader) { return 1; @@ -568,13 +568,13 @@ } } -function_entry php3_header_functions[] = { +function_entry php_header_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry php3_header_module_entry = { - "PHP_head", php3_header_functions, NULL, NULL, PHP_RINIT(head), NULL, NULL, STANDARD_MODULE_PROPERTIES +php3_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.9 php4/ext/standard/head.h:1.10 --- php4/ext/standard/head.h:1.9 Mon Jul 26 16:09:08 1999 +++ php4/ext/standard/head.h Fri Dec 17 14:51:29 1999 @@ -49,8 +49,8 @@ struct CookieList *next; } CookieList; -extern php3_module_entry php3_header_module_entry; -#define php3_header_module_ptr &php3_header_module_entry +extern php3_module_entry php_header_module_entry; +#define php_header_module_ptr &php_header_module_entry extern PHP_RINIT_FUNCTION(head); PHP_FUNCTION(Header); @@ -59,9 +59,9 @@ void php4i_add_header_information(char *header_information, uint header_length); -PHPAPI int php3_header(void); -int php3_headers_unsent(void); +PHPAPI int php_header(void); +int php_headers_unsent(void); -#define phpext_head_ptr php3_header_module_ptr +#define phpext_head_ptr php_header_module_ptr #endif Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.10 php4/ext/standard/iptc.c:1.11 --- php4/ext/standard/iptc.c:1.10 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/iptc.c Fri Dec 17 14:51:29 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.10 1999/12/17 19:16:47 zeev Exp $ */ +/* $Id: iptc.c,v 1.11 1999/12/17 19:51:29 zeev Exp $ */ /* * Functions to parse & compse IPTC data. @@ -204,7 +204,7 @@ } if (spool > 0) - if (!php3_header()){ /* we got a HEAD request. */ + if (!php_header()){ /* we got a HEAD request. */ if (spool == 2){ RETURN_TRUE; /* we only wanted to spool - report success. */ } else Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.7 php4/ext/standard/output.c:1.8 --- php4/ext/standard/output.c:1.7 Sun Dec 5 09:16:36 1999 +++ php4/ext/standard/output.c Fri Dec 17 14:51:29 1999 @@ -334,7 +334,7 @@ if (SG(request_info).headers_only) { zend_bailout(); } - if (php3_header()) { + if (php_header()) { OG(php_body_write) = php_ub_body_write_no_header; result = php_ub_body_write_no_header(str, str_length); } Index: php4/ext/standard/pageinfo.c diff -u php4/ext/standard/pageinfo.c:1.10 php4/ext/standard/pageinfo.c:1.11 --- php4/ext/standard/pageinfo.c:1.10 Sun Dec 12 11:14:40 1999 +++ php4/ext/standard/pageinfo.c Fri Dec 17 14:51:29 1999 @@ -15,7 +15,7 @@ | Authors: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: pageinfo.c,v 1.10 1999/12/12 16:14:40 sas Exp $ */ +/* $Id: pageinfo.c,v 1.11 1999/12/17 19:51:29 zeev Exp $ */ #include "php.h" #include "pageinfo.h" @@ -81,7 +81,7 @@ #endif } -long _php3_getuid(void) +long php_getuid(void) { BLS_FETCH(); @@ -95,7 +95,7 @@ { long uid; - uid = _php3_getuid(); + uid = php_getuid(); if (uid < 0) { RETURN_FALSE; } else { Index: php4/ext/standard/pageinfo.h diff -u php4/ext/standard/pageinfo.h:1.2 php4/ext/standard/pageinfo.h:1.3 --- php4/ext/standard/pageinfo.h:1.2 Sun May 16 07:19:26 1999 +++ php4/ext/standard/pageinfo.h Fri Dec 17 14:51:29 1999 @@ -6,6 +6,6 @@ PHP_FUNCTION(getmyinode); PHP_FUNCTION(getlastmod); -extern long _php3_getuid(void); +extern long php_getuid(void); #endif Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.30 php4/ext/standard/post.c:1.31 --- php4/ext/standard/post.c:1.30 Sat Dec 4 14:16:04 1999 +++ php4/ext/standard/post.c Fri Dec 17 14:51:29 1999 @@ -47,7 +47,7 @@ return; } - var_type = php3_check_ident_type(var); + var_type = php_check_ident_type(var); if (var_type == GPC_INDEXED_ARRAY) { ind = php3_get_ident_index(var); if (PG(magic_quotes_gpc)) { Index: php4/ext/standard/type.c diff -u php4/ext/standard/type.c:1.2 php4/ext/standard/type.c:1.3 --- php4/ext/standard/type.c:1.2 Fri Jul 16 09:12:57 1999 +++ php4/ext/standard/type.c Fri Dec 17 14:51:29 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: type.c,v 1.2 1999/07/16 13:12:57 zeev Exp $ */ +/* $Id: type.c,v 1.3 1999/12/17 19:51:29 zeev Exp $ */ #include "php.h" #include "type.h" @@ -58,7 +58,7 @@ * 1 - non-index array * 2 - index array */ -int php3_check_ident_type(char *str) +int php_check_ident_type(char *str) { char *s; Index: php4/ext/standard/type.h diff -u php4/ext/standard/type.h:1.1 php4/ext/standard/type.h:1.2 --- php4/ext/standard/type.h:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/type.h Fri Dec 17 14:51:29 1999 @@ -30,7 +30,7 @@ #define _TYPE_H extern int php3_check_type(char *str); -extern int php3_check_ident_type(char *str); +extern int php_check_ident_type(char *str); extern char *php3_get_ident_index(char *str); #define GPC_REGULAR 0x1 Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.14 php4/ext/standard/url.c:1.15 --- php4/ext/standard/url.c:1.14 Sun Nov 21 15:08:43 1999 +++ php4/ext/standard/url.c Fri Dec 17 14:51:29 1999 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.14 1999/11/21 20:08:43 sas Exp $ */ +/* $Id: url.c,v 1.15 1999/12/17 19:51:29 zeev Exp $ */ #include <stdlib.h> #include <string.h> @@ -395,13 +395,13 @@ if (!(*arg)->value.str.len) { RETURN_FALSE; } - len = _php3_rawurldecode((*arg)->value.str.val, (*arg)->value.str.len); + len = php_raw_url_decode((*arg)->value.str.val, (*arg)->value.str.len); RETVAL_STRINGL((*arg)->value.str.val, len, 1); } /* }}} */ -int _php3_rawurldecode(char *str, int len) +int php_raw_url_decode(char *str, int len) { char *dest = str; char *data = str; Index: php4/ext/standard/url.h diff -u php4/ext/standard/url.h:1.2 php4/ext/standard/url.h:1.3 --- php4/ext/standard/url.h:1.2 Sun May 16 07:19:26 1999 +++ php4/ext/standard/url.h Fri Dec 17 14:51:29 1999 @@ -26,7 +26,7 @@ | Authors: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.h,v 1.2 1999/05/16 11:19:26 sas Exp $ */ +/* $Id: url.h,v 1.3 1999/12/17 19:51:29 zeev Exp $ */ typedef struct url { char *scheme; @@ -43,7 +43,7 @@ extern url *url_parse(char *); extern int _php3_urldecode(char *, int); /* return value: length of decoded string */ extern char *_php3_urlencode(char *, int); -extern int _php3_rawurldecode(char *, int); /* return value: length of decoded string */ +extern int php_raw_url_decode(char *, int); /* return value: length of decoded string */ extern char *_php3_rawurlencode(char *, int); PHP_FUNCTION(parse_url); Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.16 php4/ext/sybase/sybase.c:1.17 --- php4/ext/sybase/sybase.c:1.16 Sat Dec 4 14:16:07 1999 +++ php4/ext/sybase/sybase.c Fri Dec 17 14:51:31 1999 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.16 1999/12/04 19:16:07 sas Exp $ */ +/* $Id: sybase.c,v 1.17 1999/12/17 19:51:31 zeev Exp $ */ #include "php.h" @@ -400,7 +400,7 @@ } } } - return_value->value.lval = php3_list_insert(sybase_ptr,php3_sybase_module.le_plink); + return_value->value.lval = zend_list_insert(sybase_ptr,php3_sybase_module.le_plink); return_value->type = IS_LONG; } else { /* non persistent */ list_entry *index_ptr,new_index_ptr; @@ -418,7 +418,7 @@ RETURN_FALSE; } link = (int) index_ptr->ptr; - ptr = php3_list_find(link,&type); /* check if the link is still there */ + ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==php3_sybase_module.le_link || type==php3_sybase_module.le_plink)) { return_value->value.lval = php3_sybase_module.default_link = link; return_value->type = IS_LONG; @@ -450,7 +450,7 @@ /* add it to the list */ sybase_ptr = (sybase_link *) emalloc(sizeof(sybase_link)); memcpy(sybase_ptr,&sybase,sizeof(sybase_link)); - return_value->value.lval = php3_list_insert(sybase_ptr,php3_sybase_module.le_link); + return_value->value.lval = zend_list_insert(sybase_ptr,php3_sybase_module.le_link); return_value->type = IS_LONG; /* add it to the hash */ @@ -509,13 +509,13 @@ break; } - php3_list_find(id,&type); + zend_list_find(id,&type); if (type!=php3_sybase_module.le_link && type!=php3_sybase_module.le_plink) { php_error(E_WARNING,"%d is not a Sybase link index",id); RETURN_FALSE; } - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } @@ -547,7 +547,7 @@ CHECK_LINK(id); - sybase_ptr = (sybase_link *) php3_list_find(id,&type); + sybase_ptr = (sybase_link *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_link && type!=php3_sybase_module.le_plink) { php_error(E_WARNING,"%d is not a Sybase link index",id); RETURN_FALSE; @@ -675,7 +675,7 @@ break; } - sybase_ptr = (sybase_link *) php3_list_find(id,&type); + sybase_ptr = (sybase_link *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_link && type!=php3_sybase_module.le_plink) { php_error(E_WARNING,"%d is not a Sybase link index",id); RETURN_FALSE; @@ -777,7 +777,7 @@ } } efree(column_types); - return_value->value.lval = php3_list_insert(result,php3_sybase_module.le_result); + return_value->value.lval = zend_list_insert(result,php3_sybase_module.le_result); return_value->type = IS_LONG; } @@ -796,13 +796,13 @@ if (sybase_result_index->value.lval==0) { RETURN_FALSE; } - result = (sybase_result *) php3_list_find(sybase_result_index->value.lval,&type); + result = (sybase_result *) zend_list_find(sybase_result_index->value.lval,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",sybase_result_index->value.lval); RETURN_FALSE; } - php3_list_delete(sybase_result_index->value.lval); + zend_list_delete(sybase_result_index->value.lval); RETURN_TRUE; } @@ -826,7 +826,7 @@ convert_to_long(result_index); id = result_index->value.lval; - result = (sybase_result *) php3_list_find(id,&type); + result = (sybase_result *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",id); RETURN_FALSE; @@ -850,7 +850,7 @@ convert_to_long(result_index); id = result_index->value.lval; - result = (sybase_result *) php3_list_find(id,&type); + result = (sybase_result *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",id); RETURN_FALSE; @@ -875,7 +875,7 @@ convert_to_long(sybase_result_index); id = sybase_result_index->value.lval; - result = (sybase_result *) php3_list_find(id,&type); + result = (sybase_result *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",id); RETURN_FALSE; @@ -909,7 +909,7 @@ } convert_to_long(sybase_result_index); - result = (sybase_result *) php3_list_find(sybase_result_index->value.lval,&type); + result = (sybase_result *) zend_list_find(sybase_result_index->value.lval,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",sybase_result_index->value.lval); @@ -969,7 +969,7 @@ convert_to_long(sybase_result_index); id = sybase_result_index->value.lval; - result = (sybase_result *) php3_list_find(id,&type); + result = (sybase_result *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",id); RETURN_FALSE; @@ -1061,7 +1061,7 @@ convert_to_long(sybase_result_index); id = sybase_result_index->value.lval; - result = (sybase_result *) php3_list_find(id,&type); + result = (sybase_result *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",id); RETURN_FALSE; @@ -1102,7 +1102,7 @@ convert_to_long(sybase_result_index); id = sybase_result_index->value.lval; - result = (sybase_result *) php3_list_find(id,&type); + result = (sybase_result *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",id); RETURN_FALSE; @@ -1135,7 +1135,7 @@ convert_to_long(sybase_result_index); id = sybase_result_index->value.lval; - result = (sybase_result *) php3_list_find(id,&type); + result = (sybase_result *) zend_list_find(id,&type); if (type!=php3_sybase_module.le_result) { php_error(E_WARNING,"%d is not a Sybase result index",id); RETURN_FALSE; Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.10 php4/ext/sysvsem/sysvsem.c:1.11 --- php4/ext/sysvsem/sysvsem.c:1.10 Sat Dec 4 14:16:08 1999 +++ php4/ext/sysvsem/sysvsem.c Fri Dec 17 14:51:33 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.10 1999/12/04 19:16:08 sas Exp $ */ +/* $Id: sysvsem.c,v 1.11 1999/12/17 19:51:33 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. @@ -272,7 +272,7 @@ sem_ptr->semid = semid; sem_ptr->count = 0; - return_value->value.lval = php3_list_insert(sem_ptr, php3_sysvsem_module.le_sem); + return_value->value.lval = zend_list_insert(sem_ptr, php3_sysvsem_module.le_sem); return_value->type = IS_LONG; sem_ptr->id = (int)return_value->value.lval; @@ -299,7 +299,7 @@ break; } - sem_ptr = (sysvsem_sem *) php3_list_find(id, &type); + sem_ptr = (sysvsem_sem *) zend_list_find(id, &type); if (type!=php3_sysvsem_module.le_sem) { php_error(E_WARNING, "%d is not a SysV semaphore index", id); RETURN_FALSE; Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.11 php4/ext/sysvshm/sysvshm.c:1.12 --- php4/ext/sysvshm/sysvshm.c:1.11 Sun Dec 12 05:55:27 1999 +++ php4/ext/sysvshm/sysvshm.c Fri Dec 17 14:51:34 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.11 1999/12/12 10:55:27 sas Exp $ */ +/* $Id: sysvshm.c,v 1.12 1999/12/17 19:51:34 zeev Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -142,7 +142,7 @@ shm_list_ptr->key = shm_key; shm_list_ptr->id = shm_id; shm_list_ptr->ptr = chunk_ptr; - list_id = php3_list_insert(shm_list_ptr, php3_sysvshm_module.le_shm); + list_id = zend_list_insert(shm_list_ptr, php3_sysvshm_module.le_shm); RETURN_LONG(list_id); } /* }}} */ @@ -164,7 +164,7 @@ id = (*arg_id)->value.lval; - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } @@ -220,7 +220,7 @@ convert_to_long_ex(arg_key); key = (*arg_key)->value.lval; - shm_list_ptr = (sysvshm_shm *) php3_list_find(id, &type); + shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php3_sysvshm_module.le_shm) { php_error(E_WARNING, "%d is not a SysV shared memory index", id); RETURN_FALSE; @@ -270,7 +270,7 @@ convert_to_long_ex(arg_key); key = (*arg_key)->value.lval; - shm_list_ptr = (sysvshm_shm *) php3_list_find(id, &type); + shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php3_sysvshm_module.le_shm) { php_error(E_WARNING, "%d is not a SysV shared memory index", id); RETURN_FALSE; @@ -313,7 +313,7 @@ convert_to_long_ex(arg_key); key = (*arg_key)->value.lval; - shm_list_ptr = (sysvshm_shm *) php3_list_find(id, &type); + shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php3_sysvshm_module.le_shm) { php_error(E_WARNING, "%d is not a SysV shared memory index", id); RETURN_FALSE; Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.36 php4/ext/xml/xml.c:1.37 --- php4/ext/xml/xml.c:1.36 Tue Dec 14 13:37:14 1999 +++ php4/ext/xml/xml.c Fri Dec 17 14:51:35 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.36 1999/12/14 18:37:14 joey Exp $ */ +/* $Id: xml.c,v 1.37 1999/12/17 19:51:35 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -1381,7 +1381,7 @@ ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser); - if (php3_list_delete(parser->index) == FAILURE) { + if (zend_list_delete(parser->index) == FAILURE) { RETURN_FALSE; } Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.6 php4/sapi/apache/sapi_apache.c:1.7 --- php4/sapi/apache/sapi_apache.c:1.6 Fri Dec 17 09:24:39 1999 +++ php4/sapi/apache/sapi_apache.c Fri Dec 17 14:51:36 1999 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.6 1999/12/17 14:24:39 sas Exp $ */ +/* $Id: sapi_apache.c,v 1.7 1999/12/17 19:51:36 zeev Exp $ */ #include "php.h" @@ -86,7 +86,7 @@ (void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); } - php3_header(); /* Make sure headers have been sent */ + php_header(); /* Make sure headers have been sent */ php_end_ob_buffering(1); return (OK); } Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.10 php4/sapi/cgi/cgi_main.c:1.11 --- php4/sapi/cgi/cgi_main.c:1.10 Fri Dec 17 14:16:49 1999 +++ php4/sapi/cgi/cgi_main.c Fri Dec 17 14:51:37 1999 @@ -73,7 +73,7 @@ #include "php_getopt.h" #endif -PHPAPI extern char *php3_ini_path; +PHPAPI extern char *php_ini_path; #define PHP_MODE_STANDARD 1 #define PHP_MODE_HIGHLIGHT 2 @@ -352,7 +352,7 @@ behavior=PHP_MODE_INDENT; break; case 'c': - php3_ini_path = strdup(optarg); /* intentional leak */ + php_ini_path = strdup(optarg); /* intentional leak */ break; case 'a': #if SUPPORT_INTERACTIVE @@ -482,7 +482,7 @@ break; } - php3_header(); /* Make sure headers have been sent */ + php_header(); /* Make sure headers have been sent */ if (free_path_translated) efree(SG(request_info).path_translated); php_request_shutdown((void *) 0); Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.6 php4/sapi/servlet/servlet.c:1.7 --- php4/sapi/servlet/servlet.c:1.6 Fri Dec 17 14:16:50 1999 +++ php4/sapi/servlet/servlet.c Fri Dec 17 14:51:39 1999 @@ -71,7 +71,7 @@ #include "php_getopt.h" #endif -PHPAPI extern char *php3_ini_path; +PHPAPI extern char *php_ini_path; JNIEXPORT void JNICALL Java_net_php_reflect_setEnv (JNIEnv *newJenv, jclass self); @@ -363,7 +363,7 @@ /* * Clean up */ - php3_header(); /* Make sure headers have been sent */ + php_header(); /* Make sure headers have been sent */ FREESTRING(SG(request_info).request_method); FREESTRING(SG(request_info).query_string);