diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-17 19:51:39 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-17 19:51:39 +0000 |
| commit | a3c65143323804b4780fb0bd90c03acc03eac583 (patch) | |
| tree | e2b10d65e8b34a20651e368bad72183b1ae489f8 | |
| parent | 02d3b39420839c9e09fd7c391f158e5c510bd600 (diff) | |
| download | php-git-a3c65143323804b4780fb0bd90c03acc03eac583.tar.gz | |
More php3_ annihilation
57 files changed, 652 insertions, 640 deletions
@@ -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 diff --git a/Makefile.am b/Makefile.am index baf67868c0..e3b7c0da15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ BUILDLDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) 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 \ diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c index 69f8db3fcb..9d168afafc 100644 --- a/ext/aspell/aspell.c +++ b/ext/aspell/aspell.c @@ -88,7 +88,7 @@ PHP_FUNCTION(aspell_new) 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 @@ PHP_FUNCTION(aspell_suggest) } 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 @@ PHP_FUNCTION(aspell_check) } 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 @@ PHP_FUNCTION(aspell_check_raw) } 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); diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c index c19530d9fc..4f27d17017 100644 --- a/ext/cpdf/cpdf.c +++ b/ext/cpdf/cpdf.c @@ -206,7 +206,7 @@ PHP_FUNCTION(cpdf_set_creator) { 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 @@ PHP_FUNCTION(cpdf_set_title) { 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 @@ PHP_FUNCTION(cpdf_set_subject) { 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 @@ PHP_FUNCTION(cpdf_set_keywords) { 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 @@ PHP_FUNCTION(cpdf_set_viewer_preferences) { 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 @@ PHP_FUNCTION(cpdf_open) { } 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 @@ PHP_FUNCTION(cpdf_close) { 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 @@ PHP_FUNCTION(cpdf_page_init) { 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 @@ PHP_FUNCTION(cpdf_finalize_page) { 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 @@ PHP_FUNCTION(cpdf_set_current_page) { 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 @@ PHP_FUNCTION(cpdf_begin_text) { 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 @@ PHP_FUNCTION(cpdf_end_text) { 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 @@ PHP_FUNCTION(cpdf_show) { 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 @@ PHP_FUNCTION(cpdf_show_xy) { 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 @@ PHP_FUNCTION(cpdf_continue_text) { 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 @@ PHP_FUNCTION(cpdf_text) { 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 @@ PHP_FUNCTION(cpdf_set_font) { 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 @@ PHP_FUNCTION(cpdf_set_leading) { 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 @@ PHP_FUNCTION(cpdf_set_text_rendering) { 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 @@ PHP_FUNCTION(cpdf_set_horiz_scaling) { 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 @@ PHP_FUNCTION(cpdf_set_text_rise) { 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 @@ PHP_FUNCTION(cpdf_set_text_matrix) { 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 @@ PHP_FUNCTION(cpdf_set_text_pos) { 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 @@ PHP_FUNCTION(cpdf_rotate_text) { 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 @@ PHP_FUNCTION(cpdf_set_char_spacing) { 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 @@ PHP_FUNCTION(cpdf_set_word_spacing) { 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 @@ PHP_FUNCTION(cpdf_stringwidth) { 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 @@ PHP_FUNCTION(cpdf_save) { 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 @@ PHP_FUNCTION(cpdf_restore) { 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 @@ PHP_FUNCTION(cpdf_translate) { 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 @@ PHP_FUNCTION(cpdf_scale) { 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 @@ PHP_FUNCTION(cpdf_rotate) { 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 @@ PHP_FUNCTION(cpdf_setflat) { 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 @@ PHP_FUNCTION(cpdf_setlinejoin) { 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 @@ PHP_FUNCTION(cpdf_setlinecap) { 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 @@ PHP_FUNCTION(cpdf_setmiterlimit) { 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 @@ PHP_FUNCTION(cpdf_setlinewidth) { 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 @@ PHP_FUNCTION(cpdf_setdash) { 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 @@ PHP_FUNCTION(cpdf_moveto) { 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 @@ PHP_FUNCTION(cpdf_rmoveto) { 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 @@ PHP_FUNCTION(cpdf_curveto) { 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 @@ PHP_FUNCTION(cpdf_lineto) { 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 @@ PHP_FUNCTION(cpdf_rlineto) { 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 @@ PHP_FUNCTION(cpdf_circle) { 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 @@ PHP_FUNCTION(cpdf_arc) { 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 @@ PHP_FUNCTION(cpdf_rect) { 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 @@ PHP_FUNCTION(cpdf_newpath) { 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 @@ PHP_FUNCTION(cpdf_closepath) { 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 @@ PHP_FUNCTION(cpdf_closepath_stroke) { 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 @@ PHP_FUNCTION(cpdf_stroke) { 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 @@ PHP_FUNCTION(cpdf_fill) { 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 @@ PHP_FUNCTION(cpdf_fill_stroke) { 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 @@ PHP_FUNCTION(cpdf_closepath_fill_stroke) { 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 @@ PHP_FUNCTION(cpdf_clip) { 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 @@ PHP_FUNCTION(cpdf_setgray_fill) { 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 @@ PHP_FUNCTION(cpdf_setgray_stroke) { 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 @@ PHP_FUNCTION(cpdf_setgray) { 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 @@ PHP_FUNCTION(cpdf_setrgbcolor_fill) { 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 @@ PHP_FUNCTION(cpdf_setrgbcolor_stroke) { 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 @@ PHP_FUNCTION(cpdf_setrgbcolor) { 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 @@ PHP_FUNCTION(cpdf_set_page_animation) { 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 @@ PHP_FUNCTION(cpdf_finalize) { 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 @@ PHP_FUNCTION(cpdf_output_buffer) { 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 @@ PHP_FUNCTION(cpdf_save_to_file) { 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 @@ PHP_FUNCTION(cpdf_import_jpeg) { 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 @@ PHP_FUNCTION(cpdf_place_inline_image) { 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 @@ PHP_FUNCTION(cpdf_add_annotation) { 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 @@ PHP_FUNCTION(cpdf_set_action_url) { 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 @@ PHP_FUNCTION(cpdf_add_outline) { 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 @@ PHP_FUNCTION(cpdf_add_outline) { 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); } /* }}} */ diff --git a/ext/db/db.c b/ext/db/db.c index 7dff357e77..d310e14ed2 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -196,7 +196,7 @@ dbm_info *_php3_finddbm(pval *id,HashTable *list) /* 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 @@ PHP_FUNCTION(dbmopen) { 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 @@ PHP_FUNCTION(dbmclose) { } 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; diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 468d29d0ce..43349b0a07 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -107,7 +107,7 @@ typedef struct dba_handler { 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 \ @@ -277,7 +277,7 @@ static void _php3_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ static void _php3_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ PHP_FUNCTION(dba_close) { DBA_ID_GET1; - php3_list_delete((*id)->value.lval); + zend_list_delete((*id)->value.lval); } /* }}} */ diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c index f8cb7b91c8..415f463962 100644 --- a/ext/dbase/dbase.c +++ b/ext/dbase/dbase.c @@ -137,7 +137,7 @@ PHP_FUNCTION(dbase_open) { 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 @@ PHP_FUNCTION(dbase_close) { 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 @@ PHP_FUNCTION(dbase_numrecords) { 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 @@ PHP_FUNCTION(dbase_numfields) { 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 @@ PHP_FUNCTION(dbase_pack) { 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 @@ PHP_FUNCTION(dbase_add_record) { 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 @@ void php3_dbase_replace_record(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ PHP_FUNCTION(dbase_delete_record) { 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 @@ PHP_FUNCTION(dbase_get_record) { 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 @@ PHP_FUNCTION(dbase_get_record_with_names) { 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 @@ PHP_FUNCTION(dbase_create) { 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); } /* }}} */ diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c index 81dd3782cc..accd795b9d 100644 --- a/ext/fdf/fdf.c +++ b/ext/fdf/fdf.c @@ -141,7 +141,7 @@ PHP_FUNCTION(fdf_open) { 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 @@ PHP_FUNCTION(fdf_close) { 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 @@ PHP_FUNCTION(fdf_create) { 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 @@ PHP_FUNCTION(fdf_get_value) { 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 @@ PHP_FUNCTION(fdf_set_value) { 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 @@ PHP_FUNCTION(fdf_next_field_name) { 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 @@ PHP_FUNCTION(fdf_set_ap) { 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 @@ PHP_FUNCTION(fdf_set_status) { 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 @@ PHP_FUNCTION(fdf_get_status) { 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 @@ PHP_FUNCTION(fdf_set_file) { 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 @@ PHP_FUNCTION(fdf_get_file) { 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 @@ PHP_FUNCTION(fdf_save) { 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 @@ PHP_FUNCTION(fdf_add_template) { 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; diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 7bd7f4b495..53336af627 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -118,7 +118,7 @@ PHP_MINIT_FUNCTION(ftp) 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 @@ PHP_FUNCTION(ftp_connect) 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 @@ PHP_FUNCTION(ftp_quit) } 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; } diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 8b989a8620..1aabbe96e1 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -363,7 +363,7 @@ PHP_FUNCTION(imageloadfont) { * 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 @@ PHP_FUNCTION(imagecreate) 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 @@ void php3_imagecreatefrompng (INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepng (INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepng (INTERNAL_FUNCTION_PARAMETERS) { 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 @@ PHP_FUNCTION(imagecreatefromgif ) 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 @@ PHP_FUNCTION(imagegif ) } } - 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 @@ PHP_FUNCTION(imagegif ) RETURN_FALSE; } - output = php3_header(); + output = php_header(); if (output) { gdImageGif (im, tmp); @@ -637,7 +637,7 @@ PHP_FUNCTION(imagedestroy) convert_to_long(imgind); - php3_list_delete(imgind->value.lval); + zend_list_delete(imgind->value.lval); RETURN_TRUE; } @@ -669,7 +669,7 @@ PHP_FUNCTION(imagecolorallocate) 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 @@ PHP_FUNCTION(imagecolorat) 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 @@ PHP_FUNCTION(imagecolorclosest) 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 @@ PHP_FUNCTION(imagecolordeallocate) 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 @@ PHP_FUNCTION(imagecolorresolve) 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 @@ PHP_FUNCTION(imagecolorexact) 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 @@ PHP_FUNCTION(imagecolorset) 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 @@ PHP_FUNCTION(imagecolorsforindex) 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 @@ PHP_FUNCTION(imagesetpixel) 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 @@ PHP_FUNCTION(imageline) 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 @@ PHP_FUNCTION(imagedashedline) 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 @@ PHP_FUNCTION(imagerectangle) 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 @@ PHP_FUNCTION(imagefilledrectangle) 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 @@ PHP_FUNCTION(imagearc) 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 @@ PHP_FUNCTION(imagefilltoborder) 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 @@ PHP_FUNCTION(imagefill) 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 @@ PHP_FUNCTION(imagecolorstotal) } 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 @@ PHP_FUNCTION(imagecolortransparent) } 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 @@ PHP_FUNCTION(imageinterlace) } 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 @@ static void _php3_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled) { 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 @@ static gdFontPtr _php3_find_gd_font(int size) 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 @@ static void _php3_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode) { 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 @@ PHP_FUNCTION(imagecopy) 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 @@ PHP_FUNCTION(imagecopyresized) 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 @@ PHP_FUNCTION(imagesx) 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 @@ PHP_FUNCTION(imagesy) 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 @@ void php3_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode) 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; diff --git a/ext/gd/gdt1.c b/ext/gd/gdt1.c index d26a4926d4..0b57af449d 100644 --- a/ext/gd/gdt1.c +++ b/ext/gd/gdt1.c @@ -68,7 +68,7 @@ void php3_imagepsloadfont(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepscopyfont(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepscopyfont(INTERNAL_FUNCTION_PARAMETERS) { } 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 @@ void php3_imagepsfreefont(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepsencodefont(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepsencodefont(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepsextendfont(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepsslantfont(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepstext(INTERNAL_FUNCTION_PARAMETERS) { 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 @@ void php3_imagepsbbox(INTERNAL_FUNCTION_PARAMETERS) { 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); diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index a8f7c747d2..8b4f759649 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -781,7 +781,7 @@ static void php3_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ static void php3_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ static void php3_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ PHP_FUNCTION(hw_close) { } 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 @@ PHP_FUNCTION(hw_info) } 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 @@ PHP_FUNCTION(hw_error) } 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 @@ PHP_FUNCTION(hw_errormsg) } 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 @@ char *php3_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) { } 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 @@ PHP_FUNCTION(hw_dummy) { 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 @@ PHP_FUNCTION(hw_getobject) { } 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 @@ PHP_FUNCTION(hw_insertobject) { 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 @@ PHP_FUNCTION(hw_getandlock) { 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 @@ PHP_FUNCTION(hw_unlock) { 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 @@ PHP_FUNCTION(hw_deleteobject) { 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 @@ PHP_FUNCTION(hw_changeobject) { 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 @@ PHP_FUNCTION(hw_modifyobject) { 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 @@ void php3_hw_mvcp(INTERNAL_FUNCTION_PARAMETERS, int mvcp) { 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 @@ PHP_FUNCTION(hw_gettext) { } 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 @@ PHP_FUNCTION(hw_gettext) { 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 @@ PHP_FUNCTION(hw_edittext) { 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 @@ PHP_FUNCTION(hw_edittext) { } 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 @@ PHP_FUNCTION(hw_getcgi) { 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 @@ PHP_FUNCTION(hw_getcgi) { 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 @@ PHP_FUNCTION(hw_getremote) { 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 @@ PHP_FUNCTION(hw_getremote) { 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 @@ PHP_FUNCTION(hw_getremotechildren) { 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 @@ php_printf("count = %d, remainder = <HR>%s---<HR>", count, remainder); 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 @@ PHP_FUNCTION(hw_setlinkroot) { 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 @@ PHP_FUNCTION(hw_pipedocument) { } */ 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 @@ PHP_FUNCTION(hw_pipedocument) { 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 @@ PHP_FUNCTION(hw_pipecgi) { 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 @@ PHP_FUNCTION(hw_pipecgi) { 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 @@ PHP_FUNCTION(hw_insertdocument) { 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 @@ PHP_FUNCTION(hw_new_document) { 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 @@ PHP_FUNCTION(hw_free_document) { } 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 @@ PHP_FUNCTION(hw_output_document) { } 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 @@ PHP_FUNCTION(hw_document_bodytag) { 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 @@ PHP_FUNCTION(hw_document_content) { 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 @@ PHP_FUNCTION(hw_document_setcontent) { 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 @@ PHP_FUNCTION(hw_document_size) { } 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 @@ PHP_FUNCTION(hw_document_attributes) { } 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 @@ PHP_FUNCTION(hw_getparentsobj) { 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 @@ PHP_FUNCTION(hw_getparents) { 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 @@ PHP_FUNCTION(hw_children) { 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 @@ PHP_FUNCTION(hw_childrenobj) { 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 @@ PHP_FUNCTION(hw_getchildcoll) { 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 @@ PHP_FUNCTION(hw_getchildcollobj) { 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 @@ PHP_FUNCTION(hw_docbyanchor) { 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 @@ PHP_FUNCTION(hw_docbyanchorobj) { 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 @@ PHP_FUNCTION(hw_getobjectbyquery) { 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 @@ PHP_FUNCTION(hw_getobjectbyqueryobj) { 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 @@ PHP_FUNCTION(hw_getobjectbyquerycoll) { 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 @@ PHP_FUNCTION(hw_getobjectbyquerycollobj) { 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 @@ PHP_FUNCTION(hw_getchilddoccoll) { 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 @@ PHP_FUNCTION(hw_getchilddoccollobj) { 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 @@ PHP_FUNCTION(hw_getanchors) { 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 @@ PHP_FUNCTION(hw_getanchorsobj) { 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 @@ PHP_FUNCTION(hw_getusername) { } 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 @@ PHP_FUNCTION(hw_identify) { 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 @@ PHP_FUNCTION(hw_incollections) { 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 @@ PHP_FUNCTION(hw_inscoll) { 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 @@ PHP_FUNCTION(hw_insdoc) { } 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 @@ PHP_FUNCTION(hw_getsrcbydestobj) { 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 @@ PHP_FUNCTION(hw_mapid) { 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 @@ PHP_FUNCTION(hw_getrellink) { 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 @@ PHP_FUNCTION(hw_connection_info) } 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; diff --git a/ext/icap/php3_icap.c b/ext/icap/php3_icap.c index 8279e41f72..a84e36d3bd 100644 --- a/ext/icap/php3_icap.c +++ b/ext/icap/php3_icap.c @@ -192,7 +192,7 @@ void php3_icap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ void php3_icap_close(INTERNAL_FUNCTION_PARAMETERS) } 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 @@ void php3_icap_close(INTERNAL_FUNCTION_PARAMETERS) flags = options->value.lval; icap_le_struct->flags = flags; } - php3_list_delete(ind); + zend_list_delete(ind); RETURN_TRUE; } /* }}} */ @@ -265,7 +265,7 @@ void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_expunge(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_fetch_event(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_list_events(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_create_calendar(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_rename_calendar(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_list_alarms(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_delete_calendar(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_delete_event(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_icap_snooze(INTERNAL_FUNCTION_PARAMETERS) 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"); diff --git a/ext/imap/imap.c b/ext/imap/imap.c index 07ab995f0f..2e89fba3e4 100644 --- a/ext/imap/imap.c +++ b/ext/imap/imap.c @@ -485,7 +485,7 @@ PHP_FUNCTION(imap_open) 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 @@ PHP_FUNCTION(imap_reopen) 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 @@ PHP_FUNCTION(imap_append) 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 @@ PHP_FUNCTION(imap_num_msg) 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 @@ PHP_FUNCTION(imap_ping) 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 @@ PHP_FUNCTION(imap_num_recent) } 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 @@ PHP_FUNCTION(imap_expunge) 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 @@ PHP_FUNCTION(imap_close) } 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 @@ PHP_FUNCTION(imap_close) } imap_le_struct->flags = flags; } - php3_list_delete(ind); + zend_list_delete(ind); RETURN_TRUE; } /* }}} */ @@ -732,7 +732,7 @@ PHP_FUNCTION(imap_headers) 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 @@ PHP_FUNCTION(imap_body) 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 @@ PHP_FUNCTION(imap_fetchtext_full) 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 @@ PHP_FUNCTION(imap_mail_copy) 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 @@ PHP_FUNCTION(imap_mail_move) 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 @@ PHP_FUNCTION(imap_createmailbox) 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 @@ PHP_FUNCTION(imap_renamemailbox) 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 @@ PHP_FUNCTION(imap_deletemailbox) 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 @@ PHP_FUNCTION(imap_list) 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 @@ PHP_FUNCTION(imap_listscan) 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 @@ PHP_FUNCTION(imap_check) 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 @@ PHP_FUNCTION(imap_delete) 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 @@ PHP_FUNCTION(imap_undelete) 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 @@ PHP_FUNCTION(imap_headerinfo) 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 @@ PHP_FUNCTION(imap_lsub) 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 @@ PHP_FUNCTION(imap_subscribe) 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 @@ PHP_FUNCTION(imap_unsubscribe) 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 @@ PHP_FUNCTION(imap_fetchstructure) 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 @@ PHP_FUNCTION(imap_fetchbody) 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 @@ PHP_FUNCTION(imap_mailboxmsginfo) 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 @@ PHP_FUNCTION(imap_setflag_full) 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 @@ PHP_FUNCTION(imap_clearflag_full) 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 @@ PHP_FUNCTION(imap_sort) 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 @@ PHP_FUNCTION(imap_fetchheader) 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 @@ PHP_FUNCTION(imap_uid) 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 @@ PHP_FUNCTION(imap_msgno) 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 @@ PHP_FUNCTION(imap_status) 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 @@ PHP_FUNCTION(imap_bodystruct) 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 @@ PHP_FUNCTION(imap_fetch_overview) 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 @@ PHP_FUNCTION(imap_search) } 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; diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 5b5470be65..faa781bfab 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -360,7 +360,7 @@ static void _php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ static void _php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ static void _php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) } /* 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 @@ PHP_FUNCTION(ibase_close) 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 @@ PHP_FUNCTION(ibase_query) 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 @@ PHP_FUNCTION(ibase_query) 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 @@ PHP_FUNCTION(ibase_fetch_row) } 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 @@ PHP_FUNCTION(ibase_free_result) 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 @@ PHP_FUNCTION(ibase_prepare) 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 @@ PHP_FUNCTION(ibase_prepare) 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 @@ PHP_FUNCTION(ibase_bind) 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 @@ PHP_FUNCTION(ibase_execute) 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 @@ PHP_FUNCTION(ibase_execute) 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 @@ PHP_FUNCTION(ibase_free_query) 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; } /* }}} */ diff --git a/ext/java/java.c b/ext/java/java.c index 591ffbe8cd..2b0308f6b4 100644 --- a/ext/java/java.c +++ b/ext/java/java.c @@ -227,7 +227,7 @@ static jobjectArray _java_makeArray(int argc, pval** argv) { 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 @@ void java_call_function_handler 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 @@ static pval _java_getset_property /* 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 @@ JNIEXPORT void JNICALL Java_net_php_reflect_setResultFromObject 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, diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 45f3494dbc..289bd3d0c5 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -368,7 +368,7 @@ PHP_FUNCTION(ldap_connect) 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 @@ static LDAP * _get_ldap_link(pval **link, HashTable *list) 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 @@ static LDAPMessage * _get_ldap_result(pval **result, HashTable *list) 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 @@ static LDAPMessage * _get_ldap_result_entry(pval **result, HashTable *list) 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 @@ static BerElement * _get_ber_entry(pval **berp, HashTable *list) 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 @@ PHP_FUNCTION(ber_free) WRONG_PARAM_COUNT; } - php3_list_delete((*berp)->value.lval); + zend_list_delete((*berp)->value.lval); RETURN_TRUE; } #endif @@ -531,7 +531,7 @@ PHP_FUNCTION(ldap_unbind) 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 @@ static void php3_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) #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 @@ PHP_FUNCTION(ldap_free_result) 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 @@ PHP_FUNCTION(ldap_first_entry) 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 @@ PHP_FUNCTION(ldap_next_entry) 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 @@ PHP_FUNCTION(ldap_first_attribute) } 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 diff --git a/ext/mcal/php3_mcal.c b/ext/mcal/php3_mcal.c index 72567a30df..785deacfe3 100644 --- a/ext/mcal/php3_mcal.c +++ b/ext/mcal/php3_mcal.c @@ -276,7 +276,7 @@ void php3_mcal_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ void php3_mcal_close(INTERNAL_FUNCTION_PARAMETERS) } 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 @@ void php3_mcal_close(INTERNAL_FUNCTION_PARAMETERS) flags = options->value.lval; mcal_le_struct->flags = flags; } - php3_list_delete(ind); + zend_list_delete(ind); RETURN_TRUE; } /* }}} */ @@ -349,7 +349,7 @@ void php3_mcal_reopen(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_expunge(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_fetch_event(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_fetch_current_stream_event(INTERNAL_FUNCTION_PARAMETERS) } 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 @@ void php3_mcal_list_events(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_create_calendar(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_rename_calendar(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_list_alarms(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_delete_calendar(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_delete_event(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_store_event(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_snooze(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_category(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_title(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_description(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_start(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_end(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_alarm(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_init(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_class(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_next_recurrence(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_recur_daily(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_recur_weekly(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_recur_monthly_mday(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_recur_monthly_wday(INTERNAL_FUNCTION_PARAMETERS) 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 @@ void php3_mcal_event_set_recur_yearly(INTERNAL_FUNCTION_PARAMETERS) 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"); diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index b6f8e4cf89..f94e4a70a1 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -704,7 +704,7 @@ static void oci_debug(const char *format,...) 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 @@ PHP_FUNCTION(ociwritelobtofile) goto bail; } } else { - if (php3_header()) { + if (php_header()) { PHPWRITE(buffer,toread); } } diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c index 80fad7b1a9..ab31c4d75d 100644 --- a/ext/odbc/velocis.c +++ b/ext/odbc/velocis.c @@ -131,7 +131,7 @@ velocis_add_conn(HashTable *list,VConn *conn,HDBC hdbc) { 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 @@ velocis_find_conn(HashTable *list,int ind) 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 @@ velocis_find_conn(HashTable *list,int ind) static void velocis_del_conn(HashTable *list,int ind) { - php3_list_delete(ind); + zend_list_delete(ind); } static int @@ -162,7 +162,7 @@ velocis_add_result(HashTable *list,Vresult *res,VConn *conn) { 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 @@ velocis_find_result(HashTable *list,int ind) 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 @@ velocis_find_result(HashTable *list,int ind) static void velocis_del_result(HashTable *list,int ind) { - php3_list_delete(ind); + zend_list_delete(ind); } /* Users functions */ diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c index fcb951aedd..7e31f7ee35 100644 --- a/ext/pdf/pdf.c +++ b/ext/pdf/pdf.c @@ -222,7 +222,7 @@ PHP_FUNCTION(pdf_set_info_creator) { 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 @@ PHP_FUNCTION(pdf_set_info_title) { 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 @@ PHP_FUNCTION(pdf_set_info_subject) { 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 @@ PHP_FUNCTION(pdf_set_info_author) { 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 @@ PHP_FUNCTION(pdf_set_info_keywords) { 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 @@ PHP_FUNCTION(pdf_open) { 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 @@ PHP_FUNCTION(pdf_close) { 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 @@ PHP_FUNCTION(pdf_begin_page) { 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 @@ PHP_FUNCTION(pdf_end_page) { 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 @@ PHP_FUNCTION(pdf_show) { 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 @@ PHP_FUNCTION(pdf_show_xy) { 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 @@ PHP_FUNCTION(pdf_set_font) { 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 @@ PHP_FUNCTION(pdf_get_font) { 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 @@ PHP_FUNCTION(pdf_get_fontname) { 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 @@ PHP_FUNCTION(pdf_get_fontsize) { 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 @@ PHP_FUNCTION(pdf_set_leading) { 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 @@ PHP_FUNCTION(pdf_set_text_rendering) { 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 @@ PHP_FUNCTION(pdf_set_horiz_scaling) { 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 @@ PHP_FUNCTION(pdf_set_text_rise) { 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 @@ PHP_FUNCTION(pdf_set_text_matrix) { 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 @@ PHP_FUNCTION(pdf_set_text_pos) { 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 @@ PHP_FUNCTION(pdf_set_char_spacing) { 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 @@ PHP_FUNCTION(pdf_set_word_spacing) { 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 @@ PHP_FUNCTION(pdf_continue_text) { 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 @@ PHP_FUNCTION(pdf_stringwidth) { 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 @@ PHP_FUNCTION(pdf_save) { 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 @@ PHP_FUNCTION(pdf_restore) { 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 @@ PHP_FUNCTION(pdf_translate) { 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 @@ PHP_FUNCTION(pdf_scale) { 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 @@ PHP_FUNCTION(pdf_rotate) { 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 @@ PHP_FUNCTION(pdf_setflat) { 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 @@ PHP_FUNCTION(pdf_setlinejoin) { 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 @@ PHP_FUNCTION(pdf_setlinecap) { 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 @@ PHP_FUNCTION(pdf_setmiterlimit) { 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 @@ PHP_FUNCTION(pdf_setlinewidth) { 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 @@ PHP_FUNCTION(pdf_setdash) { 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 @@ PHP_FUNCTION(pdf_moveto) { 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 @@ PHP_FUNCTION(pdf_curveto) { 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 @@ PHP_FUNCTION(pdf_lineto) { 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 @@ PHP_FUNCTION(pdf_circle) { 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 @@ PHP_FUNCTION(pdf_arc) { 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 @@ PHP_FUNCTION(pdf_rect) { 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 @@ PHP_FUNCTION(pdf_closepath) { 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 @@ PHP_FUNCTION(pdf_closepath_stroke) { 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 @@ PHP_FUNCTION(pdf_stroke) { 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 @@ PHP_FUNCTION(pdf_fill) { 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 @@ PHP_FUNCTION(pdf_fill_stroke) { 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 @@ PHP_FUNCTION(pdf_closepath_fill_stroke) { 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 @@ PHP_FUNCTION(pdf_endpath) { 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 @@ PHP_FUNCTION(pdf_clip) { 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 @@ PHP_FUNCTION(pdf_setgray_fill) { 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 @@ PHP_FUNCTION(pdf_setgray_stroke) { 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 @@ PHP_FUNCTION(pdf_setgray) { 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 @@ PHP_FUNCTION(pdf_setrgbcolor_fill) { 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 @@ PHP_FUNCTION(pdf_setrgbcolor_stroke) { 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 @@ PHP_FUNCTION(pdf_setrgbcolor) { 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 @@ PHP_FUNCTION(pdf_add_outline) { 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 @@ PHP_FUNCTION(pdf_add_outline) { 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 @@ PHP_FUNCTION(pdf_add_outline) { 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 @@ PHP_FUNCTION(pdf_set_transition) { 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 @@ PHP_FUNCTION(pdf_set_duration) { 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 @@ PHP_FUNCTION(pdf_open_gif) { 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 @@ PHP_FUNCTION(pdf_open_gif) { 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 @@ PHP_FUNCTION(pdf_open_jpeg) { 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 @@ PHP_FUNCTION(pdf_open_jpeg) { 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 @@ PHP_FUNCTION(pdf_open_memory_image) { 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 @@ PHP_FUNCTION(pdf_open_memory_image) { 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 @@ PHP_FUNCTION(pdf_open_memory_image) { 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 @@ PHP_FUNCTION(pdf_close_image) { 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 @@ PHP_FUNCTION(pdf_close_image) { 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 @@ PHP_FUNCTION(pdf_place_image) { 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 @@ PHP_FUNCTION(pdf_place_image) { 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 @@ PHP_FUNCTION(pdf_put_image) { 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 @@ PHP_FUNCTION(pdf_put_image) { 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 @@ PHP_FUNCTION(pdf_execute_image) { 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 @@ PHP_FUNCTION(pdf_execute_image) { 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 @@ PHP_FUNCTION(pdf_get_image_width) { 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 @@ PHP_FUNCTION(pdf_get_image_width) { 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 @@ PHP_FUNCTION(pdf_get_image_height) { 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 @@ PHP_FUNCTION(pdf_get_image_height) { 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 @@ PHP_FUNCTION(pdf_add_weblink) { 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 @@ PHP_FUNCTION(pdf_add_pdflink) { 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 @@ PHP_FUNCTION(pdf_set_border_style) { 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 @@ PHP_FUNCTION(pdf_set_border_color) { 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 @@ PHP_FUNCTION(pdf_add_annotation) { 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; diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 7c0d9dcefe..f2698281e6 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -314,7 +314,7 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) } 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 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) 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 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) } /* 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 @@ PHP_FUNCTION(pgsql_close) 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 @@ void php3_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) 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 @@ PHP_FUNCTION(pgsql_exec) 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 @@ PHP_FUNCTION(pgsql_exec) 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 @@ void php3_pgsql_get_result_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) } 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 @@ void php3_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) } 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 @@ PHP_FUNCTION(pgsql_field_number) } 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 @@ PHP_FUNCTION(pgsql_result) } 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 @@ static void php3_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) } 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 @@ void php3_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) } 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 @@ PHP_FUNCTION(pgsql_free_result) 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 @@ PHP_FUNCTION(pgsql_last_oid) } 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 @@ PHP_FUNCTION(pgsql_lo_create) 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 @@ PHP_FUNCTION(pgsql_lo_unlink) 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 @@ PHP_FUNCTION(pgsql_lo_open) 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 @@ PHP_FUNCTION(pgsql_lo_open) } 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 @@ PHP_FUNCTION(pgsql_lo_open) } 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 @@ PHP_FUNCTION(pgsql_lo_close) 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 @@ PHP_FUNCTION(pgsql_lo_close) } else { RETVAL_TRUE; } - php3_list_delete(id); + zend_list_delete(id); return; } /* }}} */ @@ -1394,7 +1394,7 @@ PHP_FUNCTION(pgsql_lo_read) 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 @@ PHP_FUNCTION(pgsql_lo_write) 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 @@ PHP_FUNCTION(pgsql_lo_readall) 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; diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c index c828b55e4f..5cbcc394ef 100644 --- a/ext/rpc/com/COM.c +++ b/ext/rpc/com/COM.c @@ -306,7 +306,7 @@ PHP_FUNCTION(COM_load) RETURN_FALSE; } - RETURN_LONG(php3_list_insert(i_dispatch,le_idispatch)); + RETURN_LONG(zend_list_insert(i_dispatch,le_idispatch)); } @@ -418,7 +418,7 @@ static void php_variant_to_pval(VARIANTARG *var_arg, pval *pval_arg, int persist 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 @@ PHP_FUNCTION(COM_invoke) /* 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 @@ PHP_FUNCTION(com_propget) /* 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 @@ PHP_FUNCTION(com_propput) /* 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 @@ VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_refer /* 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 @@ int php_COM_set_property_handler(zend_property_reference *property_reference, pv /* 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 */ } diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index 591ffbe8cd..2b0308f6b4 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -227,7 +227,7 @@ static jobjectArray _java_makeArray(int argc, pval** argv) { 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 @@ void java_call_function_handler 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 @@ static pval _java_getset_property /* 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 @@ JNIEXPORT void JNICALL Java_net_php_reflect_setResultFromObject 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, diff --git a/ext/standard/base64.c b/ext/standard/base64.c index fcec86bbba..3f676ba8b9 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -31,7 +31,7 @@ static char base64_table[] = }; 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 @@ PHP_FUNCTION(base64_encode) { 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; diff --git a/ext/standard/base64.h b/ext/standard/base64.h index b71898dac3..23d9ffd591 100644 --- a/ext/standard/base64.h +++ b/ext/standard/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 */ diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 0717badf87..9239ea33c6 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -209,7 +209,7 @@ PHP_FUNCTION(closedir) FETCH_DIRP(); - php3_list_delete(dirp->id); + zend_list_delete(dirp->id); } /* }}} */ diff --git a/ext/standard/file.c b/ext/standard/file.c index d4cd4fae3d..d8a312d4ce 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -700,7 +700,7 @@ PHP_FUNCTION(fclose) 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 @@ PHP_FUNCTION(pclose) 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 @@ PHP_FUNCTION(set_socket_timeout) 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 @@ PHP_FUNCTION(readfile) } RETURN_FALSE; } - if (php3_header()) { + if (php_header()) { size = php_passthru_fd(socketd, fp, issock); } if (issock) { @@ -1400,11 +1400,11 @@ PHP_FUNCTION(fpassthru) } 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); } diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index bbb22c9f1f..0cfdcc4947 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -444,7 +444,7 @@ static php3i_sockbuf *_php3_sock_create(int socket FLS_DC) 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(); diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h index a833f9be44..04108580b8 100644 --- a/ext/standard/fsock.h +++ b/ext/standard/fsock.h @@ -69,7 +69,7 @@ int _php3_is_persistent_sock(int); 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); diff --git a/ext/standard/head.c b/ext/standard/head.c index 523e3ff9ac..5bc39e5a3a 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -104,7 +104,7 @@ void php4i_add_header_information(char *header_information, uint header_length) 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 @@ PHP_FUNCTION(Header) #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 @@ PHPAPI int php3_header(void) return(1); } #else -PHPAPI int php3_header() +PHPAPI int php_header() { SLS_FETCH(); @@ -548,7 +548,7 @@ PHP_FUNCTION(setcookie) } -int php3_headers_unsent(void) +int php_headers_unsent(void) { if (php3_HeaderPrinted!=1 || !php3_PrintHeader) { return 1; @@ -568,13 +568,13 @@ PHP_FUNCTION(headers_sent) } } -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 }; /* diff --git a/ext/standard/head.h b/ext/standard/head.h index 51208a606e..df5aceb6fe 100644 --- a/ext/standard/head.h +++ b/ext/standard/head.h @@ -49,8 +49,8 @@ typedef struct CookieList { 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 @@ PHP_FUNCTION(headers_sent); 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 diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c index f790b35446..004c3998ad 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc.c @@ -204,7 +204,7 @@ PHP_FUNCTION(iptcembed) } 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 diff --git a/ext/standard/output.c b/ext/standard/output.c index a4b022313c..721379471b 100644 --- a/ext/standard/output.c +++ b/ext/standard/output.c @@ -334,7 +334,7 @@ static int php_ub_body_write(const char *str, uint str_length) 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); } diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c index 188b5bad4e..023a283fec 100644 --- a/ext/standard/pageinfo.c +++ b/ext/standard/pageinfo.c @@ -81,7 +81,7 @@ static void _php3_statpage(void) #endif } -long _php3_getuid(void) +long php_getuid(void) { BLS_FETCH(); @@ -95,7 +95,7 @@ PHP_FUNCTION(getmyuid) { long uid; - uid = _php3_getuid(); + uid = php_getuid(); if (uid < 0) { RETURN_FALSE; } else { diff --git a/ext/standard/pageinfo.h b/ext/standard/pageinfo.h index d593ade004..5f230fec05 100644 --- a/ext/standard/pageinfo.h +++ b/ext/standard/pageinfo.h @@ -6,6 +6,6 @@ PHP_FUNCTION(getmypid); PHP_FUNCTION(getmyinode); PHP_FUNCTION(getlastmod); -extern long _php3_getuid(void); +extern long php_getuid(void); #endif diff --git a/ext/standard/post.c b/ext/standard/post.c index c6b1c5297a..b1aaa26a97 100644 --- a/ext/standard/post.c +++ b/ext/standard/post.c @@ -47,7 +47,7 @@ void php_parse_gpc_data(char *val, char *var, pval *track_vars_array ELS_DC PLS_ 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)) { diff --git a/ext/standard/type.c b/ext/standard/type.c index ee6ab91049..be5c79467e 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -58,7 +58,7 @@ int php3_check_type(char *str) * 1 - non-index array * 2 - index array */ -int php3_check_ident_type(char *str) +int php_check_ident_type(char *str) { char *s; diff --git a/ext/standard/type.h b/ext/standard/type.h index 62f98bea7a..7bb136cef4 100644 --- a/ext/standard/type.h +++ b/ext/standard/type.h @@ -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 diff --git a/ext/standard/url.c b/ext/standard/url.c index 23eb24bc38..4fb2393989 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -395,13 +395,13 @@ PHP_FUNCTION(rawurldecode) 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; diff --git a/ext/standard/url.h b/ext/standard/url.h index eaf5c32f77..d075f6164b 100644 --- a/ext/standard/url.h +++ b/ext/standard/url.h @@ -43,7 +43,7 @@ void free_url(url *); 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); diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c index 0bad3988a7..3941b51b5e 100644 --- a/ext/sybase/sybase.c +++ b/ext/sybase/sybase.c @@ -400,7 +400,7 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) } } } - 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 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) 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 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) /* 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 @@ PHP_FUNCTION(sybase_close) 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 @@ PHP_FUNCTION(sybase_select_db) 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 @@ PHP_FUNCTION(sybase_query) 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 @@ PHP_FUNCTION(sybase_query) } } 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 @@ PHP_FUNCTION(sybase_free_result) 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 @@ PHP_FUNCTION(sybase_num_rows) 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 @@ PHP_FUNCTION(sybase_num_fields) 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 @@ PHP_FUNCTION(sybase_fetch_row) 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 @@ static PHP_FUNCTION(sybase_fetch_hash) } 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 @@ PHP_FUNCTION(sybase_data_seek) 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 @@ PHP_FUNCTION(sybase_fetch_field) 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 @@ PHP_FUNCTION(sybase_field_seek) 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 @@ PHP_FUNCTION(sybase_result) 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; diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 02052242dd..8a9b3352b1 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -272,7 +272,7 @@ PHP_FUNCTION(sysvsem_get) 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 @@ static void _php3_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire) 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; diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 8092ad1223..7acb7747a1 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -142,7 +142,7 @@ PHP_FUNCTION(shm_attach) 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 @@ PHP_FUNCTION(shm_detach) id = (*arg_id)->value.lval; - php3_list_delete(id); + zend_list_delete(id); RETURN_TRUE; } @@ -220,7 +220,7 @@ PHP_FUNCTION(shm_put_var) 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 @@ PHP_FUNCTION(shm_get_var) 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 @@ PHP_FUNCTION(shm_remove_var) 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; diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 931eb9df11..6f49e05014 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1381,7 +1381,7 @@ PHP_FUNCTION(xml_parser_free) 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; } diff --git a/main/configuration-parser.y b/main/configuration-parser.y index a7661d7547..aca4c2dda0 100644 --- a/main/configuration-parser.y +++ b/main/configuration-parser.y @@ -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 @@ int php_init_config(void) #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 @@ int php_init_config(void) } #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 @@ int php_init_config(void) } } #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 @@ statement: 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 @@ statement: 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 **) ¤t_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); diff --git a/main/configuration-scanner.l b/main/configuration-scanner.l index 91d5f3d6f2..d7fe0f862c 100644 --- a/main/configuration-scanner.l +++ b/main/configuration-scanner.l @@ -70,7 +70,7 @@ void init_cfg_scanner() <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 @@ void init_cfg_scanner() <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 @@ void init_cfg_scanner() 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 @@ void init_cfg_scanner() /* 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 @@ void init_cfg_scanner() } } 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; diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index c3601556a8..94c27437aa 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -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 @@ PHPAPI FILE *php_fopen_wrapper(char *path, char *mode, int options, int *issock, 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 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char ** * 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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i 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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i *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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i #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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i /* 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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i 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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i 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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i /* 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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i 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 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i return NULL; } -int _php3_getftpresult(int socketd) +int php_get_ftp_result(int socketd) { char tmp_line[513]; diff --git a/main/main.c b/main/main.c index 2fc014eeac..2d0aee4991 100644 --- a/main/main.c +++ b/main/main.c @@ -105,7 +105,7 @@ void *gLock; /*mutex variable */ /* 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 @@ PHP_INI_END() /* 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 @@ void php_log_err(char *log_message) #endif /*APACHE */ #if CGI_BINARY - if (php3_header()) { + if (php_header()) { fprintf(stderr, log_message); fprintf(stderr, "\n"); } @@ -583,9 +553,9 @@ static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path 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 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) * 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 @@ void php_request_shutdown(void *dummy) } -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 @@ static int php3_config_ini_startup(void) return SUCCESS; } -static void php3_config_ini_shutdown(void) +static void php_config_ini_shutdown(void) { php_shutdown_config(); } @@ -980,7 +950,7 @@ int php_module_startup(sapi_module_struct *sf) php_ini_mstartup(); - if (php3_config_ini_startup() == FAILURE) { + if (php_config_ini_startup() == FAILURE) { return FAILURE; } @@ -1026,7 +996,7 @@ void php_module_shutdown() } #if !USE_SAPI /* close down the ini config */ - php3_config_ini_shutdown(); + php_config_ini_shutdown(); #endif #if (WIN32|WINNT) && !(USE_SAPI) diff --git a/main/output.c b/main/output.c index a4b022313c..721379471b 100644 --- a/main/output.c +++ b/main/output.c @@ -334,7 +334,7 @@ static int php_ub_body_write(const char *str, uint str_length) 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); } diff --git a/main/php_sprintf.c b/main/php_sprintf.c new file mode 100644 index 0000000000..24b9bf15fd --- /dev/null +++ b/main/php_sprintf.c @@ -0,0 +1,42 @@ +/* + +----------------------------------------------------------------------+ + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997, 1998, 1999 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.0 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Jaakko Hyvätti <jaakko.hyvatti@iki.fi> | + +----------------------------------------------------------------------+ + */ + +/* $Id$ */ + +#include "php_config.h" +#include <stdio.h> +#include <stdarg.h> + +#if BROKEN_SPRINTF + +int +php_sprintf (char*s, const char* format, ...) +{ + va_list args; + char *ret; + + va_start (args, format); + s[0] = '\0'; + ret = vsprintf (s, format, args); + va_end (args); + if (!ret) + return -1; + return strlen (s); +} + +#endif /* BROKEN_SPRINTF */ diff --git a/main/rfc1867.c b/main/rfc1867.c index ea80949393..a32fd3f057 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -159,7 +159,7 @@ static void php_mime_split(char *buf, int cnt, char *boundary) 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 @@ static void php_mime_split(char *buf, int cnt, char *boundary) } 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); } diff --git a/main/safe_mode.c b/main/safe_mode.c index d7982e48dc..0b3a2c0483 100644 --- a/main/safe_mode.c +++ b/main/safe_mode.c @@ -64,7 +64,7 @@ PHPAPI int php_checkuid(const char *fn, int mode) { } 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 @@ PHPAPI int php_checkuid(const char *fn, int mode) { } 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); diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 4efe1e189b..1535730bbe 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -86,7 +86,7 @@ PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mod (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); } diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 1f0757009d..f117a4f99b 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -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 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine 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 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine 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); diff --git a/fhttpd.c b/sapi/fhttpd/fhttpd.c index 5e105351cb..e8f33ebc06 100644 --- a/fhttpd.c +++ b/sapi/fhttpd/fhttpd.c @@ -71,7 +71,7 @@ int checkinput(int h) } -PHPAPI void php3_fhttpd_free_header(void) +PHPAPI void php_fhttpd_free_header(void) { int i; @@ -92,7 +92,7 @@ PHPAPI void php3_fhttpd_free_header(void) } -PHPAPI void php3_fhttpd_puts_header(char *s) +PHPAPI void php_fhttpd_puts_header(char *s) { char *p0, *p1, *p2, *p3, **p; int l; @@ -162,17 +162,17 @@ void fhttpd_flush(void) { } -PHPAPI void php3_fhttpd_puts(char *s) +PHPAPI void php_fhttpd_puts(char *s) { putlinetoresponse(response, s); } -PHPAPI void php3_fhttpd_putc(char c) +PHPAPI void php_fhttpd_putc(char c) { writetoresponse(response, &c, 1); } -PHPAPI int php3_fhttpd_write(char *a, int n) +PHPAPI int php_fhttpd_write(char *a, int n) { return writetoresponse(response, a, n); } diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 0950b74e36..4b7ac7b307 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -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 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send /* * 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); |