diff options
105 files changed, 543 insertions, 529 deletions
diff --git a/ext/apache/apache.c b/ext/apache/apache.c index cda5fab222..d29579aaed 100644 --- a/ext/apache/apache.c +++ b/ext/apache/apache.c @@ -113,7 +113,7 @@ static PHP_MSHUTDOWN_FUNCTION(apache) } -php3_module_entry apache_module_entry = { +zend_module_entry apache_module_entry = { "Apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c index 9d168afafc..c96213b381 100644 --- a/ext/aspell/aspell.c +++ b/ext/aspell/aspell.c @@ -46,13 +46,13 @@ function_entry aspell_functions[] = { static int le_aspell; -php3_module_entry aspell_module_entry = { +zend_module_entry aspell_module_entry = { "Aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &aspell_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &aspell_module_entry; } #endif PHP_MINIT_FUNCTION(aspell) diff --git a/ext/aspell/php_aspell.h b/ext/aspell/php_aspell.h index d0c8b35a82..787412dddb 100644 --- a/ext/aspell/php_aspell.h +++ b/ext/aspell/php_aspell.h @@ -33,7 +33,7 @@ #ifndef _ASPELL_H #define _ASPELL_H #if HAVE_ASPELL -extern php3_module_entry aspell_module_entry; +extern zend_module_entry aspell_module_entry; #define aspell_module_ptr &aspell_module_entry extern PHP_MINIT_FUNCTION(aspell); diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index e39f602445..5f1b1e71e9 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -36,12 +36,12 @@ function_entry bcmath_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry bcmath_module_entry = { +zend_module_entry bcmath_module_entry = { "bcmath", bcmath_functions, NULL, NULL, PHP_RINIT(bcmath), PHP_RSHUTDOWN(bcmath), NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -php3_module_entry *get_module() { return &bcmath_module_entry; }; +zend_module_entry *get_module() { return &bcmath_module_entry; }; #endif #ifndef THREAD_SAFE diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h index 397ff03dd5..f9be3f53b1 100644 --- a/ext/bcmath/php_bcmath.h +++ b/ext/bcmath/php_bcmath.h @@ -40,7 +40,7 @@ #if WITH_BCMATH -extern php3_module_entry bcmath_module_entry; +extern zend_module_entry bcmath_module_entry; #define phpext_bcmath_ptr &bcmath_module_entry extern PHP_RINIT_FUNCTION(bcmath); diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c index 4f27d17017..e933591e55 100644 --- a/ext/cpdf/cpdf.c +++ b/ext/cpdf/cpdf.c @@ -150,13 +150,13 @@ function_entry cpdf_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry cpdf_module_entry = { +zend_module_entry cpdf_module_entry = { "cpdf", cpdf_functions, PHP_MINIT(cpdf), PHP_MSHUTDOWN(cpdf), PHP_RINIT(cpdf), NULL, PHP_MINFO(cpdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &cpdf_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &cpdf_module_entry; } #endif static void _free_outline(CPDFoutlineEntry *outline) @@ -183,7 +183,7 @@ PHP_RINIT_FUNCTION(cpdf) PHP_MINFO_FUNCTION(cpdf) { /* need to use a PHPAPI function here because it is external module in windows */ - php3_printf("Version %s", cpdf_version()); + php_printf("Version %s", cpdf_version()); } PHP_MSHUTDOWN_FUNCTION(cpdf){ @@ -208,7 +208,7 @@ PHP_FUNCTION(cpdf_set_creator) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -236,7 +236,7 @@ PHP_FUNCTION(cpdf_set_title) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -264,7 +264,7 @@ PHP_FUNCTION(cpdf_set_subject) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -292,7 +292,7 @@ PHP_FUNCTION(cpdf_set_keywords) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -323,7 +323,7 @@ PHP_FUNCTION(cpdf_set_viewer_preferences) { pagemode=argv[1]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -377,7 +377,7 @@ PHP_FUNCTION(cpdf_open) { convert_to_string(arg2); #if APACHE if(strcmp(arg2->value.str.val, "-") == 0) - php3_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead."); + php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead."); #endif cpdf_setOutputFilename(cpdf, arg2->value.str.val); } @@ -404,7 +404,7 @@ PHP_FUNCTION(cpdf_close) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } zend_list_delete(id); @@ -442,7 +442,7 @@ PHP_FUNCTION(cpdf_page_init) { width = argv[4]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -477,7 +477,7 @@ PHP_FUNCTION(cpdf_finalize_page) { pagenr=arg2->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -505,7 +505,7 @@ PHP_FUNCTION(cpdf_set_current_page) { pagenr=arg2->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -531,7 +531,7 @@ PHP_FUNCTION(cpdf_begin_text) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -557,7 +557,7 @@ PHP_FUNCTION(cpdf_end_text) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -584,7 +584,7 @@ PHP_FUNCTION(cpdf_show) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -615,7 +615,7 @@ PHP_FUNCTION(cpdf_show_xy) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -649,7 +649,7 @@ PHP_FUNCTION(cpdf_continue_text) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -676,7 +676,7 @@ PHP_FUNCTION(cpdf_text) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -768,12 +768,12 @@ PHP_FUNCTION(cpdf_set_font) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if(arg4->value.lval > 6) { - php3_error(E_WARNING,"Font encoding set to 5"); + php_error(E_WARNING,"Font encoding set to 5"); arg4->value.lval = 5; } cpdf_setFont(pdf, arg2->value.str.val, arg4->value.str.val, (float) arg3->value.dval); @@ -799,7 +799,7 @@ PHP_FUNCTION(cpdf_set_leading) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -826,7 +826,7 @@ PHP_FUNCTION(cpdf_set_text_rendering) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -853,7 +853,7 @@ PHP_FUNCTION(cpdf_set_horiz_scaling) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -880,7 +880,7 @@ PHP_FUNCTION(cpdf_set_text_rise) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -911,19 +911,19 @@ PHP_FUNCTION(cpdf_set_text_matrix) { matrix=arg2->value.ht; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } - if(_php3_hash_num_elements(matrix) != 6) { - php3_error(E_WARNING,"Text matrix must have 6 elements"); + if(zend_hash_num_elements(matrix) != 6) { + php_error(E_WARNING,"Text matrix must have 6 elements"); RETURN_FALSE; } pdfmatrixptr = pdfmatrix; - _php3_hash_internal_pointer_reset(matrix); - for(i=0; i<_php3_hash_num_elements(matrix); i++) { - _php3_hash_get_current_data(matrix, (void *) &data); + zend_hash_internal_pointer_reset(matrix); + for(i=0; i<zend_hash_num_elements(matrix); i++) { + zend_hash_get_current_data(matrix, (void *) &data); switch(data->type) { case IS_DOUBLE: *pdfmatrixptr++ = (float) data->value.dval; @@ -932,7 +932,7 @@ PHP_FUNCTION(cpdf_set_text_matrix) { *pdfmatrixptr++ = 0.0; break; } - _php3_hash_move_forward(matrix); + zend_hash_move_forward(matrix); } cpdf_setTextMatrix(pdf, pdfmatrix[0], pdfmatrix[1], @@ -963,7 +963,7 @@ PHP_FUNCTION(cpdf_set_text_pos) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -997,7 +997,7 @@ PHP_FUNCTION(cpdf_rotate_text) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1024,7 +1024,7 @@ PHP_FUNCTION(cpdf_set_char_spacing) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1051,7 +1051,7 @@ PHP_FUNCTION(cpdf_set_word_spacing) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1079,7 +1079,7 @@ PHP_FUNCTION(cpdf_stringwidth) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1105,7 +1105,7 @@ PHP_FUNCTION(cpdf_save) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1131,7 +1131,7 @@ PHP_FUNCTION(cpdf_restore) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1159,7 +1159,7 @@ PHP_FUNCTION(cpdf_translate) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1187,7 +1187,7 @@ PHP_FUNCTION(cpdf_scale) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1214,7 +1214,7 @@ PHP_FUNCTION(cpdf_rotate) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1242,12 +1242,12 @@ PHP_FUNCTION(cpdf_setflat) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 100) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); + php_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); RETURN_FALSE; } @@ -1274,12 +1274,12 @@ PHP_FUNCTION(cpdf_setlinejoin) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); + php_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); RETURN_FALSE; } @@ -1306,12 +1306,12 @@ PHP_FUNCTION(cpdf_setlinecap) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); + php_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); RETURN_FALSE; } @@ -1338,12 +1338,12 @@ PHP_FUNCTION(cpdf_setmiterlimit) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } if(arg2->value.dval < 1) { - php3_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); + php_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); RETURN_FALSE; } @@ -1370,7 +1370,7 @@ PHP_FUNCTION(cpdf_setlinewidth) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1400,7 +1400,7 @@ PHP_FUNCTION(cpdf_setdash) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1432,7 +1432,7 @@ PHP_FUNCTION(cpdf_moveto) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1469,7 +1469,7 @@ PHP_FUNCTION(cpdf_rmoveto) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1510,7 +1510,7 @@ PHP_FUNCTION(cpdf_curveto) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1557,7 +1557,7 @@ PHP_FUNCTION(cpdf_lineto) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1594,7 +1594,7 @@ PHP_FUNCTION(cpdf_rlineto) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1632,7 +1632,7 @@ PHP_FUNCTION(cpdf_circle) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1672,7 +1672,7 @@ PHP_FUNCTION(cpdf_arc) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1711,7 +1711,7 @@ PHP_FUNCTION(cpdf_rect) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1750,7 +1750,7 @@ PHP_FUNCTION(cpdf_newpath) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1776,7 +1776,7 @@ PHP_FUNCTION(cpdf_closepath) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1802,7 +1802,7 @@ PHP_FUNCTION(cpdf_closepath_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1829,7 +1829,7 @@ PHP_FUNCTION(cpdf_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1855,7 +1855,7 @@ PHP_FUNCTION(cpdf_fill) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1881,7 +1881,7 @@ PHP_FUNCTION(cpdf_fill_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1908,7 +1908,7 @@ PHP_FUNCTION(cpdf_closepath_fill_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1936,7 +1936,7 @@ PHP_FUNCTION(cpdf_clip) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1963,7 +1963,7 @@ PHP_FUNCTION(cpdf_setgray_fill) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -1990,7 +1990,7 @@ PHP_FUNCTION(cpdf_setgray_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2017,7 +2017,7 @@ PHP_FUNCTION(cpdf_setgray) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2046,7 +2046,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_fill) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2075,7 +2075,7 @@ PHP_FUNCTION(cpdf_setrgbcolor_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2104,7 +2104,7 @@ PHP_FUNCTION(cpdf_setrgbcolor) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2135,7 +2135,7 @@ PHP_FUNCTION(cpdf_set_page_animation) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2162,7 +2162,7 @@ PHP_FUNCTION(cpdf_finalize) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2190,7 +2190,7 @@ PHP_FUNCTION(cpdf_output_buffer) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2219,13 +2219,13 @@ PHP_FUNCTION(cpdf_save_to_file) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } #if APACHE if(strcmp(arg2->value.str.val, "-") == 0) - php3_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Use cpdf_output_buffer() instead."); + php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Use cpdf_output_buffer() instead."); #endif cpdf_savePDFmemoryStreamToFile(pdf, arg2->value.str.val); @@ -2266,7 +2266,7 @@ PHP_FUNCTION(cpdf_import_jpeg) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2331,14 +2331,14 @@ PHP_FUNCTION(cpdf_place_inline_image) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } gid=argv[1]->value.lval; im = zend_list_find(gid, &type); if (!im || type != phpi_get_le_gd()) { - php3_error(E_WARNING, "cpdf: Unable to find image pointer"); + php_error(E_WARNING, "cpdf: Unable to find image pointer"); RETURN_FALSE; } @@ -2413,7 +2413,7 @@ PHP_FUNCTION(cpdf_add_annotation) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2472,7 +2472,7 @@ PHP_FUNCTION(cpdf_set_action_url) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2529,7 +2529,7 @@ PHP_FUNCTION(cpdf_add_outline) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=CPDF_GLOBAL(le_cpdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2537,7 +2537,7 @@ PHP_FUNCTION(cpdf_add_outline) { lastoutline = zend_list_find(oid,&type); if(!lastoutline || type!=CPDF_GLOBAL(le_outline)) { lastoutline = NULL; -/* php3_error(E_WARNING,"Unable to find last outline entry %d",id); +/* php_error(E_WARNING,"Unable to find last outline entry %d",id); RETURN_FALSE; */ } diff --git a/ext/cpdf/php_cpdf.h b/ext/cpdf/php_cpdf.h index 48823a9216..90f4087034 100644 --- a/ext/cpdf/php_cpdf.h +++ b/ext/cpdf/php_cpdf.h @@ -35,7 +35,7 @@ #include <cpdflib.h> -extern php3_module_entry cpdf_module_entry; +extern zend_module_entry cpdf_module_entry; #define cpdf_module_ptr &cpdf_module_entry extern PHP_MINFO_FUNCTION(cpdf); diff --git a/ext/dav/dav.c b/ext/dav/dav.c index 0f8cd56a7a..ca57c6ecb2 100644 --- a/ext/dav/dav.c +++ b/ext/dav/dav.c @@ -70,7 +70,7 @@ phpdav_module php3_dav_module; /* {{{ dynamically loadable module stuff */ # if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &phpdav_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &phpdav_module_entry; }; # endif /* COMPILE_DL */ /* }}} */ @@ -90,7 +90,7 @@ function_entry phpdav_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry phpdav_module_entry = { +zend_module_entry phpdav_module_entry = { "DAV", /* extension name */ phpdav_functions, /* extension function list */ php3_minit_phpdav, /* extension-wide startup function */ diff --git a/ext/dav/php_dav.h b/ext/dav/php_dav.h index b1ab062de1..3b0fbed2fb 100644 --- a/ext/dav/php_dav.h +++ b/ext/dav/php_dav.h @@ -40,7 +40,7 @@ typedef struct { char *mkcol_create_handler; } phpdav_module; -extern php3_module_entry phpdav_module_entry; +extern zend_module_entry phpdav_module_entry; # define phpdav_module_ptr &phpdav_module_entry int phpdav_mkcol_test_handler(request_rec *); diff --git a/ext/db/db.c b/ext/db/db.c index d310e14ed2..bfa289a6d8 100644 --- a/ext/db/db.c +++ b/ext/db/db.c @@ -263,7 +263,7 @@ PHP_FUNCTION(dbmopen) { convert_to_string(filename); convert_to_string(mode); - info = _php3_dbmopen(filename->value.str.val, mode->value.str.val); + info = php_dbm_open(filename->value.str.val, mode->value.str.val); if (info) { ret = zend_list_insert(info, DBM_GLOBAL(le_db)); RETURN_LONG(ret); @@ -272,7 +272,7 @@ PHP_FUNCTION(dbmopen) { } } -dbm_info *_php3_dbmopen(char *filename, char *mode) { +dbm_info *php_dbm_open(char *filename, char *mode) { dbm_info *info; int ret, lock=0; char *lockfn = NULL; @@ -289,7 +289,7 @@ dbm_info *_php3_dbmopen(char *filename, char *mode) { PLS_FETCH(); if (filename == NULL) { - php_error(E_WARNING, "NULL filename passed to _php3_dbmopen()"); + php_error(E_WARNING, "NULL filename passed to php_dbm_open()"); return NULL; } @@ -424,7 +424,7 @@ PHP_FUNCTION(dbmclose) { } } -int _php3_dbmclose(dbm_info *info) { +int php_dbm_close(dbm_info *info) { int ret = 0; DBM_TYPE dbf; int lockfd; @@ -475,11 +475,11 @@ PHP_FUNCTION(dbminsert) RETURN_FALSE; } - ret = _php3_dbminsert(info, key->value.str.val, value->value.str.val); + ret = php_dbm_insert(info, key->value.str.val, value->value.str.val); RETURN_LONG(ret); } -int _php3_dbminsert(dbm_info *info, char *key, char *value) { +int php_dbm_insert(dbm_info *info, char *key, char *value) { datum key_datum, value_datum; int ret; DBM_TYPE dbf; @@ -528,11 +528,11 @@ PHP_FUNCTION(dbmreplace) RETURN_FALSE; } - ret = _php3_dbmreplace(info, key->value.str.val, value->value.str.val); + ret = php_dbm_replace(info, key->value.str.val, value->value.str.val); RETURN_LONG(ret); } -int _php3_dbmreplace(dbm_info *info, char *key, char *value) { +int php_dbm_replace(dbm_info *info, char *key, char *value) { DBM_TYPE dbf; int ret; datum key_datum, value_datum; @@ -582,7 +582,7 @@ PHP_FUNCTION(dbmfetch) RETURN_FALSE; } - return_value->value.str.val = _php3_dbmfetch(info, key->value.str.val); + return_value->value.str.val = php_dbm_fetch(info, key->value.str.val); if (return_value->value.str.val) { return_value->value.str.len = strlen(return_value->value.str.val); return_value->type = IS_STRING; @@ -591,7 +591,7 @@ PHP_FUNCTION(dbmfetch) } } -char *_php3_dbmfetch(dbm_info *info, char *key) { +char *php_dbm_fetch(dbm_info *info, char *key) { datum key_datum, value_datum; char *ret; DBM_TYPE dbf; @@ -1099,7 +1099,7 @@ PHP_MINIT_FUNCTION(db) } #endif - DBM_GLOBAL(le_db) = register_list_destructors(_php3_dbmclose,NULL); + DBM_GLOBAL(le_db) = register_list_destructors(php_dbm_close,NULL); return SUCCESS; } @@ -1144,12 +1144,12 @@ function_entry dbm_functions[] = { {NULL,NULL,NULL} }; -php3_module_entry dbm_module_entry = { +zend_module_entry dbm_module_entry = { "DBM", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &dbm_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &dbm_module_entry; } #endif #endif diff --git a/ext/db/php_db.h b/ext/db/php_db.h index 30c8f809a3..cecc5aaf8c 100644 --- a/ext/db/php_db.h +++ b/ext/db/php_db.h @@ -40,7 +40,7 @@ #endif -extern php3_module_entry dbm_module_entry; +extern zend_module_entry dbm_module_entry; #define phpext_db_ptr &dbm_module_entry @@ -63,11 +63,11 @@ typedef struct dbm_info { #endif dbm_info *_php3_finddbm(pval *id,HashTable *list); -int _php3_dbmclose(dbm_info *info); -dbm_info *_php3_dbmopen(char *filename, char *mode); -int _php3_dbminsert(dbm_info *info, char *key, char *value); -char *_php3_dbmfetch(dbm_info *info, char *key); -int _php3_dbmreplace(dbm_info *info, char *key, char *value); +int php_dbm_close(dbm_info *info); +dbm_info *php_dbm_open(char *filename, char *mode); +int php_dbm_insert(dbm_info *info, char *key, char *value); +char *php_dbm_fetch(dbm_info *info, char *key); +int php_dbm_replace(dbm_info *info, char *key, char *value); int _php3_dbmexists(dbm_info *info, char *key); int _php3_dbmdelete(dbm_info *info, char *key); char *_php3_dbmfirstkey(dbm_info *info); diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 43349b0a07..56a5f3aa59 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -62,7 +62,7 @@ static PHP_MINIT_FUNCTION(dba); static PHP_MSHUTDOWN_FUNCTION(dba); static PHP_MINFO_FUNCTION(dba); -php3_module_entry dba_module_entry = { +zend_module_entry dba_module_entry = { "DataBase API", dba_functions, PHP_MINIT(dba), PHP_MSHUTDOWN(dba), diff --git a/ext/dba/php_dba.h b/ext/dba/php_dba.h index 4a1470c503..a504e972d1 100644 --- a/ext/dba/php_dba.h +++ b/ext/dba/php_dba.h @@ -53,7 +53,7 @@ typedef struct dba_info { struct dba_handler *hnd; } dba_info; -extern php3_module_entry dba_module_entry; +extern zend_module_entry dba_module_entry; #define dba_module_ptr &dba_module_entry /* common prototypes which must be supplied by modules */ diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c index 415f463962..f3b8498d37 100644 --- a/ext/dbase/dbase.c +++ b/ext/dbase/dbase.c @@ -724,13 +724,13 @@ function_entry dbase_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry dbase_module_entry = { +zend_module_entry dbase_module_entry = { "DBase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if defined(COMPILE_DL) -DLEXPORT php3_module_entry *get_module(void) { return &dbase_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &dbase_module_entry; } #if (WIN32|WINNT) && defined(THREAD_SAFE) diff --git a/ext/dbase/php_dbase.h b/ext/dbase/php_dbase.h index 1f083e7b3a..00800a582b 100644 --- a/ext/dbase/php_dbase.h +++ b/ext/dbase/php_dbase.h @@ -32,7 +32,7 @@ #ifndef _DBASE_H #define _DBASE_H #if DBASE -extern php3_module_entry dbase_module_entry; +extern zend_module_entry dbase_module_entry; #define dbase_module_ptr &dbase_module_entry extern PHP_MINIT_FUNCTION(dbase); diff --git a/ext/domxml/domxml.c b/ext/domxml/domxml.c index 6dae8c887c..684bb96292 100644 --- a/ext/domxml/domxml.c +++ b/ext/domxml/domxml.c @@ -70,7 +70,7 @@ static zend_function_entry php_domxmlattr_class_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry php3_domxml_module_entry = { +zend_module_entry php3_domxml_module_entry = { "DOM", php_domxml_functions, PHP_MINIT(domxml), NULL, NULL, NULL, PHP_MINFO(domxml), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/domxml/php_domxml.h b/ext/domxml/php_domxml.h index 70fc1c5c9d..4cc78fe5db 100644 --- a/ext/domxml/php_domxml.h +++ b/ext/domxml/php_domxml.h @@ -37,7 +37,7 @@ #if HAVE_DOMXML #include <gnome-xml/parser.h> -extern php3_module_entry php3_domxml_module_entry; +extern zend_module_entry php3_domxml_module_entry; #define php3_domxml_module_ptr &php3_domxml_module_entry /* directory functions */ diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h index c261abf4d2..6b03d641ee 100644 --- a/ext/ereg/php_ereg.h +++ b/ext/ereg/php_ereg.h @@ -33,7 +33,7 @@ #ifndef _REG_H #define _REG_H -extern php3_module_entry regexp_module_entry; +extern zend_module_entry regexp_module_entry; #define regexp_module_ptr ®exp_module_entry char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase, int extended); diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c index accd795b9d..6b40b5cf74 100644 --- a/ext/fdf/fdf.c +++ b/ext/fdf/fdf.c @@ -80,14 +80,14 @@ function_entry fdf_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry fdf_module_entry = { +zend_module_entry fdf_module_entry = { "fdf", fdf_functions, PHP_MINIT(fdf), PHP_MSHUTDOWN(fdf), NULL, NULL, PHP_MINFO(fdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &fdf_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &fdf_module_entry; } #endif static void phpi_FDFClose(FDFDoc fdf) { @@ -548,7 +548,7 @@ PHP_FUNCTION(fdf_add_template) { id=(*arg1)->value.lval; fdf = zend_list_find(id,&type); if(!fdf || type!=FDF_GLOBAL(le_fdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } diff --git a/ext/fdf/php_fdf.h b/ext/fdf/php_fdf.h index ab2256c5fe..cef900dc01 100644 --- a/ext/fdf/php_fdf.h +++ b/ext/fdf/php_fdf.h @@ -39,7 +39,7 @@ #include <FdfTk.h> -extern php3_module_entry fdf_module_entry; +extern zend_module_entry fdf_module_entry; #define phpext_fdf_ptr &fdf_module_entry extern PHP_MINIT_FUNCTION(fdf); diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c index caa32669df..abc8de25ec 100644 --- a/ext/filepro/filepro.c +++ b/ext/filepro/filepro.c @@ -131,14 +131,14 @@ function_entry filepro_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry filepro_module_entry = { +zend_module_entry filepro_module_entry = { "FilePro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &filepro_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &filepro_module_entry; } #if (WIN32|WINNT) && defined(THREAD_SAFE) /*NOTE: You should have an odbc.def file where you diff --git a/ext/filepro/php_filepro.h b/ext/filepro/php_filepro.h index 850eeb8dcd..fc70497cdb 100644 --- a/ext/filepro/php_filepro.h +++ b/ext/filepro/php_filepro.h @@ -39,7 +39,7 @@ #ifndef _FILEPRO_H #define _FILEPRO_H #if HAVE_FILEPRO -extern php3_module_entry filepro_module_entry; +extern zend_module_entry filepro_module_entry; #define phpext_filepro_ptr &filepro_module_entry PHP_FUNCTION(filepro); diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 53336af627..1b86f1f4cf 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -37,7 +37,7 @@ #ifndef ZEND_VERSION #include "internal_functions.h" #include "php3_list.h" -#define php_error php3_error +#define php_error php_error #endif #include "ext/standard/file.h" @@ -72,7 +72,7 @@ function_entry php3_ftp_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry php3_ftp_module_entry = { +zend_module_entry php3_ftp_module_entry = { "FTP Functions", php3_ftp_functions, #ifdef ZEND_VERSION diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h index 7da896cc8d..fa978c4531 100644 --- a/ext/ftp/php_ftp.h +++ b/ext/ftp/php_ftp.h @@ -40,7 +40,7 @@ #if HAVE_FTP -extern php3_module_entry php3_ftp_module_entry; +extern zend_module_entry php3_ftp_module_entry; #define php3_ftp_module_ptr &php3_ftp_module_entry #ifdef ZEND_VERSION diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 1aabbe96e1..722e8ea670 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -131,13 +131,13 @@ function_entry gd_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry gd_module_entry = { +zend_module_entry gd_module_entry = { "gd", gd_functions, PHP_MINIT(gd), PHP_MSHUTDOWN(gd), NULL, NULL, PHP_MINFO(gd), STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_GD # include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &gd_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &gd_module_entry; } #endif @@ -416,7 +416,7 @@ void php3_imagecreatefrompng (INTERNAL_FUNCTION_PARAMETERS) { #endif if (!fp) { php_strip_url_passwd(fn); - php3_error(E_WARNING, + php_error(E_WARNING, "ImageCreateFromPng: Unable to open %s for reading", fn); RETURN_FALSE; } @@ -448,19 +448,19 @@ void php3_imagepng (INTERNAL_FUNCTION_PARAMETERS) { convert_to_string(file); fn = file->value.str.val; if (!fn || fn == empty_string || php_check_open_basedir(fn)) { - php3_error(E_WARNING, "ImagePng: Invalid filename"); + php_error(E_WARNING, "ImagePng: Invalid filename"); RETURN_FALSE; } } im = zend_list_find(imgind->value.lval, &ind_type); if (!im || ind_type != GD_GLOBAL(le_gd)) { - php3_error(E_WARNING, "ImagePng: unable to find image pointer"); + php_error(E_WARNING, "ImagePng: unable to find image pointer"); RETURN_FALSE; } if (argc == 2) { fp = fopen(fn, "wb"); if (!fp) { - php3_error(E_WARNING, "ImagePng: unable to open %s for writing", fn); + php_error(E_WARNING, "ImagePng: unable to open %s for writing", fn); RETURN_FALSE; } gdImagePng (im,fp); @@ -473,7 +473,7 @@ void php3_imagepng (INTERNAL_FUNCTION_PARAMETERS) { char buf[4096]; tmp = tmpfile(); if (tmp == NULL) { - php3_error(E_WARNING, "Unable to open temporary file"); + php_error(E_WARNING, "Unable to open temporary file"); RETURN_FALSE; } output = php_header(); diff --git a/ext/gd/gdt1.c b/ext/gd/gdt1.c index 0b57af449d..7eabd4282f 100644 --- a/ext/gd/gdt1.c +++ b/ext/gd/gdt1.c @@ -51,16 +51,16 @@ void php3_imagepsloadfont(INTERNAL_FUNCTION_PARAMETERS) { efree(f_ind); switch (l_ind) { case -1: - php3_error(E_WARNING, "Couldn't find the font file"); + php_error(E_WARNING, "Couldn't find the font file"); RETURN_FALSE; break; case -2: case -3: - php3_error(E_WARNING, "Memory allocation fault in t1lib"); + php_error(E_WARNING, "Memory allocation fault in t1lib"); RETURN_FALSE; break; default: - php3_error(E_WARNING, "An unknown error occurred in t1lib"); + php_error(E_WARNING, "An unknown error occurred in t1lib"); RETURN_FALSE; break; } @@ -91,7 +91,7 @@ void php3_imagepscopyfont(INTERNAL_FUNCTION_PARAMETERS) { of_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -103,19 +103,19 @@ void php3_imagepscopyfont(INTERNAL_FUNCTION_PARAMETERS) { efree(nf_ind); switch (l_ind) { case -1: - php3_error(E_WARNING, "FontID %d is not loaded in memory", l_ind); + php_error(E_WARNING, "FontID %d is not loaded in memory", l_ind); RETURN_FALSE; break; case -2: - php3_error(E_WARNING, "Tried to copy a logical font"); + php_error(E_WARNING, "Tried to copy a logical font"); RETURN_FALSE; break; case -3: - php3_error(E_WARNING, "Memory allocation fault in t1lib"); + php_error(E_WARNING, "Memory allocation fault in t1lib"); RETURN_FALSE; break; default: - php3_error(E_WARNING, "An unknown error occurred in t1lib"); + php_error(E_WARNING, "An unknown error occurred in t1lib"); RETURN_FALSE; break; } @@ -143,7 +143,7 @@ void php3_imagepsfreefont(INTERNAL_FUNCTION_PARAMETERS) { zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -170,19 +170,19 @@ void php3_imagepsencodefont(INTERNAL_FUNCTION_PARAMETERS) { f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } if ((enc_vector = T1_LoadEncoding(enc->value.str.val)) == NULL) { - php3_error(E_WARNING, "Couldn't load encoding vector from %s", enc->value.str.val); + php_error(E_WARNING, "Couldn't load encoding vector from %s", enc->value.str.val); RETURN_FALSE; } T1_DeleteAllSizes(f_ind->font_id); if (T1_ReencodeFont(f_ind->font_id, enc_vector)) { T1_DeleteEncoding(enc_vector); - php3_error(E_WARNING, "Couldn't reencode font"); + php_error(E_WARNING, "Couldn't reencode font"); RETURN_FALSE; } zend_list_insert(enc_vector, GD_GLOBAL(le_ps_enc)); @@ -207,7 +207,7 @@ void php3_imagepsextendfont(INTERNAL_FUNCTION_PARAMETERS) { f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -234,7 +234,7 @@ void php3_imagepsslantfont(INTERNAL_FUNCTION_PARAMETERS) { f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -312,14 +312,14 @@ void php3_imagepstext(INTERNAL_FUNCTION_PARAMETERS) { bg_img = zend_list_find(img->value.lval, &type); if (!bg_img || type != GD_GLOBAL(le_gd)) { - php3_error(E_WARNING, "Unable to find image pointer"); + php_error(E_WARNING, "Unable to find image pointer"); RETURN_FALSE; } f_ind = zend_list_find(fnt->value.lval, &type); if (!f_ind || type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } @@ -349,7 +349,7 @@ void php3_imagepstext(INTERNAL_FUNCTION_PARAMETERS) { T1_AASetLevel(T1_AA_HIGH); break; default: - php3_error(E_WARNING, "Invalid value %d as number of steps for antialiasing", aa_steps); + php_error(E_WARNING, "Invalid value %d as number of steps for antialiasing", aa_steps); RETURN_FALSE; } @@ -374,7 +374,7 @@ void php3_imagepstext(INTERNAL_FUNCTION_PARAMETERS) { } str_img = T1_AAFillOutline(str_path, 0); #else - php3_error(E_WARNING, "Setting space between characters in function ImagePSText is supported only with t1lib version 0.9 or above"); + php_error(E_WARNING, "Setting space between characters in function ImagePSText is supported only with t1lib version 0.9 or above"); RETURN_FALSE; #endif } else { @@ -457,7 +457,7 @@ void php3_imagepsbbox(INTERNAL_FUNCTION_PARAMETERS) { f_ind = zend_list_find(fnt->value.lval, &type); if (type != GD_GLOBAL(le_ps_font)) { - php3_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); + php_error(E_WARNING, "%d is not a Type 1 font index", fnt->value.lval); RETURN_FALSE; } diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index f5e92e4fbb..8fdc825e0b 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -49,7 +49,7 @@ #include <gd.h> -extern php3_module_entry gd_module_entry; +extern zend_module_entry gd_module_entry; #define phpext_gd_ptr &gd_module_entry /* gd.c functions */ diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index 860d26de43..794565255b 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -36,7 +36,7 @@ function_entry php3_gettext_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry php3_gettext_module_entry = { +zend_module_entry php3_gettext_module_entry = { "gettext", php3_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES }; diff --git a/ext/gettext/php_gettext.h b/ext/gettext/php_gettext.h index e01d041b94..1f85fdb690 100644 --- a/ext/gettext/php_gettext.h +++ b/ext/gettext/php_gettext.h @@ -37,7 +37,7 @@ #include "modules.h" #endif -extern php3_module_entry php3_gettext_module_entry; +extern zend_module_entry php3_gettext_module_entry; #define gettext_module_ptr &php3_gettext_module_entry PHP_MINFO_FUNCTION(gettext); diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c index b0629b918f..29897b3b89 100644 --- a/ext/hyperwave/hg_comm.c +++ b/ext/hyperwave/hg_comm.c @@ -1178,38 +1178,38 @@ hg_msg *recv_hg_msg(int sockfd) hg_msg *msg; if ( (msg = (hg_msg *)emalloc(sizeof(hg_msg))) == NULL ) { -/* php3_printf("recv_hg_msg"); */ +/* php_printf("recv_hg_msg"); */ lowerror = LE_MALLOC; return(NULL); } if ( hg_read_exact(sockfd, (char *)&(msg->length), 4) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (1) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (1) returned -1\n"); */ efree(msg); return(NULL); } if ( hg_read_exact(sockfd, (char *)&(msg->version_msgid), 4) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (2) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (2) returned -1\n"); */ efree(msg); return(NULL); } if ( hg_read_exact(sockfd, (char *)&(msg->msg_type), 4) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (3) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (3) returned -1\n"); */ efree(msg); return(NULL); } if ( msg->length > HEADER_LENGTH ) { if ( (msg->buf = (char *) emalloc(msg->length-HEADER_LENGTH)) == NULL ) { -/* php3_printf("recv_hg_msg"); */ +/* php_printf("recv_hg_msg"); */ lowerror = LE_MALLOC; efree(msg); return(NULL); } if ( hg_read_exact(sockfd, msg->buf, msg->length-HEADER_LENGTH) == -1 ) { -/* php3_printf("recv_hg_msg: hg_read (4) returned -1\n"); */ +/* php_printf("recv_hg_msg: hg_read (4) returned -1\n"); */ efree(msg->buf); efree(msg); return(NULL); @@ -1219,7 +1219,7 @@ hg_msg *recv_hg_msg(int sockfd) msg->buf = NULL; #ifdef HW_DEBUG - php3_printf("<B> Recv msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); + php_printf("<B> Recv msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); #endif return(msg); } @@ -1230,11 +1230,11 @@ hg_msg *recv_ready(int sockfd) hg_msg *ready_msg; if ( (ready_msg = recv_hg_msg(sockfd)) == NULL ) { -/* php3_printf("recv_ready: recv_hg_msg returned NULL\n"); */ +/* php_printf("recv_ready: recv_hg_msg returned NULL\n"); */ return(NULL); } if ( ready_msg->msg_type != READY_MESSAGE ) { -/* php3_printf("recv_ready: recv_hg_msg returned wrong message: %d, %d \n", ready_msg->length, ready_msg->msg_type); */ +/* php_printf("recv_ready: recv_hg_msg returned wrong message: %d, %d \n", ready_msg->length, ready_msg->msg_type); */ efree(ready_msg); return(NULL); } @@ -4106,7 +4106,7 @@ int send_pipedocument(int sockfd, char *host, hw_objectID objectID, int mode, in */ if(host) { if((hostptr = gethostbyname(host)) == NULL) { - php3_error(E_WARNING, "gethostbyname failed for %s", host); + php_error(E_WARNING, "gethostbyname failed for %s", host); HWSOCK_FCLOSE(fd); return(-2); } @@ -4189,7 +4189,7 @@ int send_pipedocument(int sockfd, char *host, hw_objectID objectID, int mode, in */ len = sizeof(serv_addr); if((newfd = accept(fd, (struct sockaddr *) &serv_addr, &len)) < 0) { -/* php3_printf("client: can't open data connection to server\n"); */ +/* php_printf("client: can't open data connection to server\n"); */ if(attributes) efree(attributes); HWSOCK_FCLOSE(fd); return(-8); @@ -4284,7 +4284,7 @@ int send_pipecgi(int sockfd, char *host, hw_objectID objectID, char *cgi_env_str */ if(host) { if((hostptr = gethostbyname(host)) == NULL) { - php3_error(E_WARNING, "gethostbyname failed for %s", host); + php_error(E_WARNING, "gethostbyname failed for %s", host); HWSOCK_FCLOSE(fd); return(-1); } @@ -4302,7 +4302,7 @@ int send_pipecgi(int sockfd, char *host, hw_objectID objectID, char *cgi_env_str hostip = inet_ntoa(*ptr1); break; default: -/* php3_printf(stderr, "unknown address type\n"); */ +/* php_printf(stderr, "unknown address type\n"); */ break; } @@ -4467,7 +4467,7 @@ int send_putdocument(int sockfd, char *host, hw_objectID parentID, char *objectR */ if(host) { if((hostptr = gethostbyname(host)) == NULL) { - php3_error(E_WARNING, "gethostbyname failed for %s", host); + php_error(E_WARNING, "gethostbyname failed for %s", host); /* close(fd); fd is not set yet */ return(-4); } @@ -4757,7 +4757,7 @@ static int send_hg_msg(int sockfd, hg_msg *msg, int length) char *buf, *tmp; #ifdef HW_DEBUG - php3_printf("<B>Sending msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); + php_printf("<B>Sending msg: </B>type = %d -- id = %d<BR>\n", msg->msg_type, msg->version_msgid); #endif if ( length < HEADER_LENGTH ) { /* fprintf(stderr, "send_hg_msg: bad msg\n"); */ @@ -4869,7 +4869,7 @@ static char *build_msg_int(char *buf, int val) { int tmp; #ifdef HW_DEBUG - php3_printf(" Added int to header: <B>%d</B><BR>\n", val); + php_printf(" Added int to header: <B>%d</B><BR>\n", val); #endif tmp = swap_on ? swap(val) : val; memcpy(buf, (char *)&tmp, 4); @@ -4883,7 +4883,7 @@ static char *build_msg_str(char *buf, char *str) int len = strlen(str)+1; #ifdef HW_DEBUG - php3_printf(" Added str to header: <B>%s</B> (%d)<BR>\n", str, strlen(str)); + php_printf(" Added str to header: <B>%s</B> (%d)<BR>\n", str, strlen(str)); #endif memcpy(buf, str, len); diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index 8b4f759649..452c276055 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -115,7 +115,7 @@ function_entry hw_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry hw_module_entry = { +zend_module_entry hw_module_entry = { "HyperWave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), 0, 0, 0, NULL }; @@ -126,13 +126,13 @@ PHP_HW_API php_hw_globals hw_globals; #endif #ifdef COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &hw_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &hw_module_entry; } #endif void print_msg(hg_msg *msg, char *str, int txt); #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &hw_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &hw_module_entry; } #endif void _close_hw_link(hw_connection *conn) @@ -3609,13 +3609,13 @@ PHP_FUNCTION(hw_mapid) { id=(*arg3)->value.lval; ptr = zend_list_find(link,&type); if(!ptr || (type!=HwSG(le_socketp) && type!=HwSG(le_psocketp))) { - php3_error(E_WARNING,"Unable to find file identifier %d",link); + php_error(E_WARNING,"Unable to find file identifier %d",link); RETURN_FALSE; } set_swap(ptr->swap_on); if (0 != (ptr->lasterror = send_mapid(ptr->socket, servid, id, &virtid))) { - php3_error(E_WARNING, "send_command (mapid) returned %d\n", ptr->lasterror); + php_error(E_WARNING, "send_command (mapid) returned %d\n", ptr->lasterror); RETURN_FALSE; } RETURN_LONG(virtid); diff --git a/ext/hyperwave/php_hyperwave.h b/ext/hyperwave/php_hyperwave.h index c7f04f32fb..6049ffb9fc 100644 --- a/ext/hyperwave/php_hyperwave.h +++ b/ext/hyperwave/php_hyperwave.h @@ -50,7 +50,7 @@ #include "hg_comm.h" -extern php3_module_entry hw_module_entry; +extern zend_module_entry hw_module_entry; #define hw_module_ptr &hw_module_entry typedef struct { diff --git a/ext/icap/php3_icap.c b/ext/icap/php3_icap.c index a84e36d3bd..74c6f72d39 100644 --- a/ext/icap/php3_icap.c +++ b/ext/icap/php3_icap.c @@ -94,13 +94,13 @@ function_entry icap_functions[] = { }; -php3_module_entry php3_icap_module_entry = { +zend_module_entry php3_icap_module_entry = { CALVER, icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &php3_icap_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &php3_icap_module_entry; } #endif /* @@ -127,11 +127,11 @@ CALSTREAM *cal_close_it (pils *icap_le_struct) PHP_MINFO_FUNCTION(icap) { - php3_printf("Icap Support enabled<br>"); - php3_printf("<table>"); - php3_printf("<tr><td>Icap Version:</td>"); - php3_printf("<td>%s</td>",CALVER); - php3_printf("</tr></table>"); + php_printf("Icap Support enabled<br>"); + php_printf("<table>"); + php_printf("<tr><td>Icap Version:</td>"); + php_printf("<td>%s</td>",CALVER); + php_printf("</tr></table>"); } PHP_MINIT_FUNCTION(icap) @@ -185,7 +185,7 @@ void php3_icap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) } icap_stream = cal_open(NULL,calendar->value.str.val,0); if (!icap_stream) { - php3_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); + php_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); RETURN_FALSE; } @@ -216,7 +216,7 @@ void php3_icap_close(INTERNAL_FUNCTION_PARAMETERS) ind = streamind->value.lval; icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==2) { @@ -267,7 +267,7 @@ void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS) ind = streamind->value.lval; icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -280,7 +280,7 @@ void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS) // icap_stream = cal_connect(calendar->value.str.val); // cal_login(icap_stream, calendar->value.str.val); if (icap_stream == NULL) { - php3_error(E_WARNING,"Couldn't re-open stream\n"); + php_error(E_WARNING,"Couldn't re-open stream\n"); RETURN_FALSE; } RETURN_TRUE; @@ -308,7 +308,7 @@ void php3_icap_expunge(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -336,7 +336,7 @@ void php3_icap_fetch_event(INTERNAL_FUNCTION_PARAMETERS) ind = streamind->value.lval; icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==3) { @@ -414,7 +414,7 @@ void php3_icap_list_events(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -424,34 +424,34 @@ void php3_icap_list_events(INTERNAL_FUNCTION_PARAMETERS) } begincal.has_time=0; endcal.has_time=0; - if(_php3_hash_find(begindate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(begindate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); begincal.year=(*pvalue)->value.lval; } - if(_php3_hash_find(begindate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(begindate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); begincal.mon=(*pvalue)->value.lval; } - if(_php3_hash_find(begindate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(begindate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); begincal.mday=(*pvalue)->value.lval; } if(myargc == 3) { - if(_php3_hash_find(enddate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(enddate->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); endcal.year=(*pvalue)->value.lval; } - if(_php3_hash_find(enddate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(enddate->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); endcal.mon=(*pvalue)->value.lval; } - if(_php3_hash_find(enddate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(enddate->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); endcal.mday=(*pvalue)->value.lval; @@ -492,7 +492,7 @@ void php3_icap_create_calendar(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -528,7 +528,7 @@ void php3_icap_rename_calendar(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -566,7 +566,7 @@ void php3_icap_list_alarms(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -575,28 +575,28 @@ void php3_icap_list_alarms(INTERNAL_FUNCTION_PARAMETERS) } mydate.has_date=1; mydate.has_time=1; - if(_php3_hash_find(date->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(date->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.year=(*pvalue)->value.lval; } - if(_php3_hash_find(date->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(date->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.mon=(*pvalue)->value.lval; } - if(_php3_hash_find(date->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(date->value.ht,"day",sizeof("day"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.mday=(*pvalue)->value.lval; } - if(_php3_hash_find(time->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(time->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.hour=(*pvalue)->value.lval; } - if(_php3_hash_find(time->value.ht,"minute",sizeof("minute"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(time->value.ht,"minute",sizeof("minute"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); mydate.min=(*pvalue)->value.lval; @@ -636,7 +636,7 @@ void php3_icap_delete_calendar(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -671,7 +671,7 @@ void php3_icap_delete_event(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if (cal_remove(icap_le_struct->icap_stream,uid->value.lval)) @@ -725,7 +725,7 @@ void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -734,69 +734,69 @@ void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS) RETURN_FALSE; } myevent=calevent_new(); - if(_php3_hash_find(storeobject->value.ht,"uid",sizeof("uid"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"uid",sizeof("uid"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->id=(*pvalue)->value.lval; } - if(_php3_hash_find(storeobject->value.ht,"public",sizeof("public"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"public",sizeof("public"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->public=(*pvalue)->value.lval; } - if(_php3_hash_find(storeobject->value.ht,"category",sizeof("category"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"category",sizeof("category"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_string(*pvalue); myevent->category=strdup((*pvalue)->value.str.val); } - if(_php3_hash_find(storeobject->value.ht,"title",sizeof("title"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"title",sizeof("title"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_string(*pvalue); myevent->title=strdup((*pvalue)->value.str.val); } - if(_php3_hash_find(storeobject->value.ht,"description",sizeof("description"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"description",sizeof("description"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_string(*pvalue); myevent->description=strdup((*pvalue)->value.str.val); } - if(_php3_hash_find(storeobject->value.ht,"alarm",sizeof("alarm"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"alarm",sizeof("alarm"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->alarm=(*pvalue)->value.lval; } - if(_php3_hash_find(storeobject->value.ht,"start",sizeof("start"),(void **) &temppvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"start",sizeof("start"),(void **) &temppvalue)== SUCCESS){ SEPARATE_ZVAL(temppvalue); convert_to_array(*temppvalue); - if(_php3_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.year=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.mon=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.mday=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.hour=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.min=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->start.sec=(*pvalue)->value.lval; @@ -804,36 +804,36 @@ void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS) myevent->start.has_date=true; } - if(_php3_hash_find(storeobject->value.ht,"end",sizeof("end"),(void **) &temppvalue)== SUCCESS){ + if(zend_hash_find(storeobject->value.ht,"end",sizeof("end"),(void **) &temppvalue)== SUCCESS){ SEPARATE_ZVAL(temppvalue); convert_to_array(*temppvalue); - if(_php3_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.year=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.mon=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.mday=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.hour=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.min=(*pvalue)->value.lval; } - if(_php3_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find((*temppvalue)->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ SEPARATE_ZVAL(pvalue); convert_to_long(*pvalue); myevent->end.sec=(*pvalue)->value.lval; @@ -870,7 +870,7 @@ void php3_icap_snooze(INTERNAL_FUNCTION_PARAMETERS) icap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!icap_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } diff --git a/ext/icap/php_icap.h b/ext/icap/php_icap.h index f7e1b06b54..50bb3eee8c 100644 --- a/ext/icap/php_icap.h +++ b/ext/icap/php_icap.h @@ -21,7 +21,7 @@ extern PHP_MINIT_FUNCTION(icap); PHP_MINFO_FUNCTION(icap); /* Functions accessable to PHP */ -extern php3_module_entry php3_icap_module_entry; +extern zend_module_entry php3_icap_module_entry; #define php3_icap_module_ptr &php3_icap_module_entry #define phpext_icap_ptr php3_icap_module_ptr diff --git a/ext/imap/imap.c b/ext/imap/imap.c index 2e89fba3e4..7501853bf6 100644 --- a/ext/imap/imap.c +++ b/ext/imap/imap.c @@ -2638,7 +2638,7 @@ PHP_FUNCTION(imap_search) ind = streamind->value.lval; imap_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!imap_le_struct || !IS_STREAM(ind_type)) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } diff --git a/ext/informix/php_informix.h b/ext/informix/php_informix.h index d21bc8b498..ea9c311b5f 100644 --- a/ext/informix/php_informix.h +++ b/ext/informix/php_informix.h @@ -57,7 +57,7 @@ #include "TSRM.h" #endif -extern php3_module_entry ifx_module_entry; +extern zend_module_entry ifx_module_entry; #define ifx_module_ptr &ifx_module_entry diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index faa781bfab..8cb2717382 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -46,7 +46,7 @@ function_entry ibase_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry ibase_module_entry = +zend_module_entry ibase_module_entry = { "InterBase", ibase_functions, diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h index 30980e51da..88686e64fb 100644 --- a/ext/interbase/php_interbase.h +++ b/ext/interbase/php_interbase.h @@ -41,7 +41,7 @@ #if HAVE_IBASE #include <ibase.h> -extern php3_module_entry ibase_module_entry; +extern zend_module_entry ibase_module_entry; #define php3_ibase_module_ptr &ibase_module_entry extern PHP_MINIT_FUNCTION(ibase); diff --git a/ext/java/java.c b/ext/java/java.c index 2b0308f6b4..c761e34101 100644 --- a/ext/java/java.c +++ b/ext/java/java.c @@ -433,7 +433,7 @@ static PHP_MINFO_FUNCTION(java) { DISPLAY_INI_ENTRIES(); } -php3_module_entry java_module_entry = { +zend_module_entry java_module_entry = { "java", java_functions, PHP_MINIT(java), diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 289bd3d0c5..dceadd3097 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -97,7 +97,7 @@ function_entry ldap_functions[] = { }; -php3_module_entry ldap_module_entry = { +zend_module_entry ldap_module_entry = { "LDAP", ldap_functions, PHP_MINIT(ldap), PHP_MSHUTDOWN(ldap), NULL, NULL, PHP_MINFO(ldap), STANDARD_MODULE_PROPERTIES }; @@ -105,7 +105,7 @@ php3_module_entry ldap_module_entry = { #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void ) { return &ldap_module_entry; } +DLEXPORT zend_module_entry *get_module(void ) { return &ldap_module_entry; } #endif diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h index a8b1b60867..6c0d461ff7 100644 --- a/ext/ldap/php_ldap.h +++ b/ext/ldap/php_ldap.h @@ -43,7 +43,7 @@ #include <lber.h> #include <ldap.h> -extern php3_module_entry ldap_module_entry; +extern zend_module_entry ldap_module_entry; #define ldap_module_ptr &ldap_module_entry /* LDAP functions */ diff --git a/ext/mcal/php3_mcal.c b/ext/mcal/php3_mcal.c index 785deacfe3..159e820b16 100644 --- a/ext/mcal/php3_mcal.c +++ b/ext/mcal/php3_mcal.c @@ -125,15 +125,15 @@ PHP_FE(mcal_fetch_current_stream_event,NULL) }; #ifdef ZEND_VERSION -php3_module_entry php3_mcal_module_entry = { +zend_module_entry php3_mcal_module_entry = { CALVER, mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), 0, 0, 0, NULL }; #else -php3_module_entry php3_mcal_module_entry = {"mcal", mcal_functions, PHP_MINIT_FUNCTION, NULL, NULL, NULL, PHP_MINFO_FUNCTION, 0, 0, 0, NULL}; +zend_module_entry php3_mcal_module_entry = {"mcal", mcal_functions, PHP_MINIT_FUNCTION, NULL, NULL, NULL, PHP_MINFO_FUNCTION, 0, 0, 0, NULL}; #endif #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &php3_mcal_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &php3_mcal_module_entry; } #endif /* @@ -160,11 +160,11 @@ PHP_MINFO_FUNCTION(mcal) void PHP_MINFO_FUNCTION(void) #endif { - php3_printf("Mcal Support enabled<br>"); - php3_printf("<table>"); - php3_printf("<tr><td>Mcal Version:</td>"); - php3_printf("<td>%s</td>",CALVER); - php3_printf("</tr></table>"); + php_printf("Mcal Support enabled<br>"); + php_printf("<table>"); + php_printf("<tr><td>Mcal Version:</td>"); + php_printf("<td>%s</td>",CALVER); + php_printf("</tr></table>"); } #ifdef ZEND_VERSION @@ -234,7 +234,7 @@ static int add_assoc_object(pval *arg, char *key, pval tmp) } return zend_hash_update(symtable, key, strlen(key)+1, (void *) &tmp, sizeof(pval *), NULL); #else - return _php3_hash_update(arg->value.ht, key, strlen(key)+1, (void *) &tmp, sizeof(pval), NULL); + return zend_hash_update(arg->value.ht, key, strlen(key)+1, (void *) &tmp, sizeof(pval), NULL); #endif } @@ -264,11 +264,11 @@ void php3_mcal_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) if(myargc ==4) { convert_to_long(options); flags=options->value.lval; - php3_printf("option is: %d\n",options->value.lval); + php_printf("option is: %d\n",options->value.lval); } mcal_stream = cal_open(NULL,calendar->value.str.val,0); if (!mcal_stream) { - php3_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); + php_error(E_WARNING,"Couldn't open stream %s\n",calendar->value.str.val); RETURN_FALSE; } @@ -300,7 +300,7 @@ void php3_mcal_close(INTERNAL_FUNCTION_PARAMETERS) ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==2) { @@ -351,7 +351,7 @@ void php3_mcal_reopen(INTERNAL_FUNCTION_PARAMETERS) ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -362,7 +362,7 @@ void php3_mcal_reopen(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct->flags = cl_flags; } if (mcal_stream == NULL) { - php3_error(E_WARNING,"Couldn't re-open stream\n"); + php_error(E_WARNING,"Couldn't re-open stream\n"); RETURN_FALSE; } RETURN_TRUE; @@ -389,7 +389,7 @@ void php3_mcal_expunge(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -417,7 +417,7 @@ void php3_mcal_fetch_event(INTERNAL_FUNCTION_PARAMETERS) ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if(myargcount==3) { @@ -451,7 +451,7 @@ void php3_mcal_fetch_current_stream_event(INTERNAL_FUNCTION_PARAMETERS) ind = streamind->value.lval; mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } make_event_object(return_value,mcal_le_struct->event); @@ -557,7 +557,7 @@ void php3_mcal_list_events(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -617,7 +617,7 @@ void php3_mcal_create_calendar(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -653,7 +653,7 @@ void php3_mcal_rename_calendar(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } /* @@ -690,7 +690,7 @@ void php3_mcal_list_alarms(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -745,7 +745,7 @@ void php3_mcal_delete_calendar(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -780,7 +780,7 @@ void php3_mcal_delete_event(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } if (cal_remove(mcal_le_struct->mcal_stream,uid->value.lval)) @@ -822,7 +822,7 @@ void php3_mcal_store_event(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -859,7 +859,7 @@ void php3_mcal_snooze(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -898,7 +898,7 @@ void php3_mcal_event_set_category(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->category=strdup(category->value.str.val); @@ -926,7 +926,7 @@ void php3_mcal_event_set_title(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->title=strdup(title->value.str.val); @@ -954,7 +954,7 @@ void php3_mcal_event_set_description(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->description=strdup(description->value.str.val); @@ -988,7 +988,7 @@ void php3_mcal_event_set_start(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -1030,7 +1030,7 @@ void php3_mcal_event_set_end(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } @@ -1065,7 +1065,7 @@ void php3_mcal_event_set_alarm(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->alarm=alarm->value.lval; @@ -1092,7 +1092,7 @@ void php3_mcal_event_init(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } php3_event_init(mcal_le_struct); @@ -1127,7 +1127,7 @@ void php3_mcal_event_set_class(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } mcal_le_struct->event->public=class->value.lval; @@ -1326,37 +1326,37 @@ void php3_mcal_next_recurrence(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } - if(_php3_hash_find(next->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"year",sizeof("year"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.year=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"month",sizeof("month"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.mon=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"mday",sizeof("mday"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.mday=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"hour",sizeof("hour"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.hour=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"min",sizeof("min"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.min=(pvalue)->value.lval; } - if(_php3_hash_find(next->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ + if(zend_hash_find(next->value.ht,"sec",sizeof("sec"),(void **) &pvalue)== SUCCESS){ convert_to_long(pvalue); mydate.sec=(pvalue)->value.lval; @@ -1410,7 +1410,7 @@ void php3_mcal_event_set_recur_daily(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1449,7 +1449,7 @@ void php3_mcal_event_set_recur_weekly(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1488,7 +1488,7 @@ void php3_mcal_event_set_recur_monthly_mday(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1527,7 +1527,7 @@ void php3_mcal_event_set_recur_monthly_wday(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); @@ -1566,7 +1566,7 @@ void php3_mcal_event_set_recur_yearly(INTERNAL_FUNCTION_PARAMETERS) mcal_le_struct = (pils *)zend_list_find(ind, &ind_type); if (!mcal_le_struct ) { - php3_error(E_WARNING, "Unable to find stream pointer"); + php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } dt_setdate(&endtime,year->value.lval,month->value.lval,day->value.lval); diff --git a/ext/mcal/php_mcal.h b/ext/mcal/php_mcal.h index b519725cc5..5b58b1d23a 100644 --- a/ext/mcal/php_mcal.h +++ b/ext/mcal/php_mcal.h @@ -18,8 +18,8 @@ #endif /* Functions accessable to PHP */ -//extern php3_module_entry php3_mcal_module_entry; -extern php3_module_entry php3_mcal_module_entry; +//extern zend_module_entry php3_mcal_module_entry; +extern zend_module_entry php3_mcal_module_entry; #define php3_mcal_module_ptr &php3_mcal_module_entry #define phpext_mcal_ptr php3_mcal_module_ptr diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h index fbeda253c3..87585ae2cc 100644 --- a/ext/mcrypt/php_mcrypt.h +++ b/ext/mcrypt/php_mcrypt.h @@ -4,7 +4,7 @@ #if HAVE_LIBMCRYPT #if PHP_API_VERSION < 19990421 -#define zend_module_entry php3_module_entry +#define zend_module_entry zend_module_entry #include "modules.h" #include "internal_functions.h" #endif diff --git a/ext/mhash/php_mhash.h b/ext/mhash/php_mhash.h index e5341151d5..60f3955c18 100644 --- a/ext/mhash/php_mhash.h +++ b/ext/mhash/php_mhash.h @@ -4,7 +4,7 @@ #if HAVE_LIBMHASH #if PHP_API_VERSION < 19990421 -#define zend_module_entry php3_module_entry +#define zend_module_entry zend_module_entry #include "modules.h" #include "internal_functions.h" #endif diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index f94e4a70a1..cc3e2dfdfa 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -92,7 +92,7 @@ PHP_OCI_API php_oci_globals oci_globals; /* {{{ dynamically loadable module stuff */ #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &oci_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &oci_module_entry; }; #endif /* COMPILE_DL */ /* }}} */ @@ -259,7 +259,7 @@ static zend_function_entry php_oci_lob_class_functions[] = { {NULL,NULL,NULL} }; -php3_module_entry oci8_module_entry = { +zend_module_entry oci8_module_entry = { "Oracle-OCI8", /* extension name */ php_oci_functions, /* extension function list */ PHP_MINIT(oci), /* extension-wide startup function */ @@ -2441,7 +2441,7 @@ PHP_FUNCTION(ocisavelob) if (offparam == -1) { offset = curloblen; } else if (offparam >= curloblen) { - php3_error(E_WARNING, "Offset smaller than current LOB-Size - appending"); + php_error(E_WARNING, "Offset smaller than current LOB-Size - appending"); offset = curloblen; } else { offset = offparam; @@ -2455,7 +2455,7 @@ PHP_FUNCTION(ocisavelob) loblen = (*arg)->value.str.len; if (loblen < 1) { - php3_error(E_WARNING, "Cannot save a lob wich size is less than 1 byte"); + php_error(E_WARNING, "Cannot save a lob wich size is less than 1 byte"); RETURN_FALSE; } diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index d495aa66fa..51377c5ee2 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -171,7 +171,7 @@ typedef struct { OCIEnv *pEnv; } php_oci_globals; -extern php3_module_entry oci8_module_entry; +extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry #define OCI_MAX_NAME_LEN 64 diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 7327521ee5..fed1ba12ce 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -116,7 +116,7 @@ function_entry odbc_functions[] = { { NULL, NULL, NULL } }; -php3_module_entry odbc_module_entry = { +zend_module_entry odbc_module_entry = { "ODBC", odbc_functions, PHP_MINIT(odbc), @@ -279,7 +279,7 @@ static PHP_INI_DISP(display_lrl) if (atoi(value) <= 0) { PUTS("Passthru"); } else { - php3_printf("return up to %s bytes", value); + php_printf("return up to %s bytes", value); } } } diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index 897d3d8e43..aa37156321 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/php_odbc.h @@ -147,7 +147,7 @@ PHP_FUNCTION(solid_fetch_prev); #include <sqlext.h> #endif -extern php3_module_entry odbc_module_entry; +extern zend_module_entry odbc_module_entry; #define odbc_module_ptr &odbc_module_entry diff --git a/ext/odbc/php_velocis.h b/ext/odbc/php_velocis.h index 2b24c5e055..e5f9b1effd 100644 --- a/ext/odbc/php_velocis.h +++ b/ext/odbc/php_velocis.h @@ -70,7 +70,7 @@ typedef struct { int le_link,le_result; } velocis_module; -extern php3_module_entry velocis_module_entry; +extern zend_module_entry velocis_module_entry; #define velocis_module_ptr &velocis_module_entry /* velocis.c functions */ diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c index ab31c4d75d..b49fff2f24 100644 --- a/ext/odbc/velocis.c +++ b/ext/odbc/velocis.c @@ -59,14 +59,14 @@ function_entry velocis_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry velocis_module_entry = { +zend_module_entry velocis_module_entry = { "Velocis", velocis_functions, PHP_MINIT(velocis), PHP_MSHUTDOWN(velocis), PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -php3_module_entry *get_module() { return &velocis_module_entry; } +zend_module_entry *get_module() { return &velocis_module_entry; } #endif THREAD_LS velocis_module php3_velocis_module; diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index 60407d0e2a..464eee04a3 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -136,7 +136,7 @@ function_entry oracle_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry oracle_module_entry = { +zend_module_entry oracle_module_entry = { "Oracle", oracle_functions, PHP_MINIT(oracle), /* extension-wide startup function */ @@ -183,7 +183,7 @@ static const text *ora_func_tab[] = }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &oracle_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &oracle_module_entry; }; #endif static int _close_oraconn(oraConnection *conn) diff --git a/ext/oracle/php_oracle.h b/ext/oracle/php_oracle.h index 724ddcc964..a0c9e977ae 100644 --- a/ext/oracle/php_oracle.h +++ b/ext/oracle/php_oracle.h @@ -25,7 +25,7 @@ #include "ociapr.h" #endif -extern php3_module_entry oracle_module_entry; +extern zend_module_entry oracle_module_entry; #define phpext_oracle_ptr &oracle_module_entry #ifdef ZTS diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c index 7e31f7ee35..03d9dd040e 100644 --- a/ext/pdf/pdf.c +++ b/ext/pdf/pdf.c @@ -159,13 +159,13 @@ function_entry pdf_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry pdf_module_entry = { +zend_module_entry pdf_module_entry = { "pdf", pdf_functions, PHP_MINIT(pdf), PHP_MSHUTDOWN(pdf), NULL, NULL, PHP_MINFO(pdf), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL #include "dl/phpdl.h" -DLEXPORT php3_module_entry *get_module(void) { return &pdf_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &pdf_module_entry; } #endif static void _free_pdf_image(int image) @@ -193,11 +193,11 @@ PHP_MINIT_FUNCTION(pdf) PHP_MINFO_FUNCTION(pdf) { /* need to use a PHPAPI function here because it is external module in windows */ - php3_printf("pdflib %d.%02d<BR>", PDF_get_majorversion(), PDF_get_minorversion()); + php_printf("pdflib %d.%02d<BR>", PDF_get_majorversion(), PDF_get_minorversion()); #if PDFLIB_MINORVERSION > 0 - php3_printf("The function pdf_put_image() and pdf_execute_image() are <B>not</B> available"); + php_printf("The function pdf_put_image() and pdf_execute_image() are <B>not</B> available"); #else - php3_printf("The function pdf_put_image() and pdf_execute_image() are available"); + php_printf("The function pdf_put_image() and pdf_execute_image() are available"); #endif } @@ -224,7 +224,7 @@ PHP_FUNCTION(pdf_set_info_creator) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -254,7 +254,7 @@ PHP_FUNCTION(pdf_set_info_title) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -284,7 +284,7 @@ PHP_FUNCTION(pdf_set_info_subject) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -314,7 +314,7 @@ PHP_FUNCTION(pdf_set_info_author) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -344,7 +344,7 @@ PHP_FUNCTION(pdf_set_info_keywords) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if (!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); + php_error(E_WARNING,"Unable to find file identifier %d (type=%d)",id, type); RETURN_FALSE; } @@ -397,7 +397,7 @@ PHP_FUNCTION(pdf_close) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -428,7 +428,7 @@ PHP_FUNCTION(pdf_begin_page) { width = arg3->value.dval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -454,7 +454,7 @@ PHP_FUNCTION(pdf_end_page) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -481,7 +481,7 @@ PHP_FUNCTION(pdf_show) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -510,7 +510,7 @@ PHP_FUNCTION(pdf_show_xy) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -553,12 +553,12 @@ PHP_FUNCTION(pdf_set_font) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg4->value.lval > 5) || (arg4->value.lval < 0)) { - php3_error(E_WARNING,"Font encoding set to 4"); + php_error(E_WARNING,"Font encoding set to 4"); arg4->value.lval = 4; } @@ -579,12 +579,12 @@ PHP_FUNCTION(pdf_set_font) { font = PDF_findfont(pdf, arg2->value.str.val, "winansi", embed); break; default: - php3_error(E_WARNING,"Encoding out of range, using 0"); + php_error(E_WARNING,"Encoding out of range, using 0"); font = PDF_findfont(pdf, arg2->value.str.val, "builtin", embed); } if (font < 0) { - php3_error(E_WARNING,"Font %s not found", arg2->value.str.val); + php_error(E_WARNING,"Font %s not found", arg2->value.str.val); RETURN_FALSE; } @@ -610,7 +610,7 @@ PHP_FUNCTION(pdf_get_font) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -637,7 +637,7 @@ PHP_FUNCTION(pdf_get_fontname) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -664,7 +664,7 @@ PHP_FUNCTION(pdf_get_fontsize) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -691,7 +691,7 @@ PHP_FUNCTION(pdf_set_leading) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -718,7 +718,7 @@ PHP_FUNCTION(pdf_set_text_rendering) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -745,7 +745,7 @@ PHP_FUNCTION(pdf_set_horiz_scaling) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -772,7 +772,7 @@ PHP_FUNCTION(pdf_set_text_rise) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -803,19 +803,19 @@ PHP_FUNCTION(pdf_set_text_matrix) { matrix=arg2->value.ht; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } - if(_php3_hash_num_elements(matrix) != 6) { - php3_error(E_WARNING,"Text matrix must have 6 elements"); + if(zend_hash_num_elements(matrix) != 6) { + php_error(E_WARNING,"Text matrix must have 6 elements"); RETURN_FALSE; } pdfmatrixptr = (float *) &pdfmatrix; - _php3_hash_internal_pointer_reset(matrix); - for(i=0; i<_php3_hash_num_elements(matrix); i++) { - _php3_hash_get_current_data(matrix, (void *) &data); + zend_hash_internal_pointer_reset(matrix); + for(i=0; i<zend_hash_num_elements(matrix); i++) { + zend_hash_get_current_data(matrix, (void *) &data); switch(data->type) { case IS_DOUBLE: *pdfmatrixptr++ = (float) data->value.dval; @@ -824,7 +824,7 @@ PHP_FUNCTION(pdf_set_text_matrix) { *pdfmatrixptr++ = 0.0; break; } - _php3_hash_move_forward(matrix); + zend_hash_move_forward(matrix); } PDF_set_text_matrix(pdf, pdfmatrix[0], pdfmatrix[1], pdfmatrix[2], @@ -852,7 +852,7 @@ PHP_FUNCTION(pdf_set_text_pos) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -879,7 +879,7 @@ PHP_FUNCTION(pdf_set_char_spacing) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -906,7 +906,7 @@ PHP_FUNCTION(pdf_set_word_spacing) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -933,7 +933,7 @@ PHP_FUNCTION(pdf_continue_text) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -961,7 +961,7 @@ PHP_FUNCTION(pdf_stringwidth) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -987,7 +987,7 @@ PHP_FUNCTION(pdf_save) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1013,7 +1013,7 @@ PHP_FUNCTION(pdf_restore) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1041,7 +1041,7 @@ PHP_FUNCTION(pdf_translate) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1069,7 +1069,7 @@ PHP_FUNCTION(pdf_scale) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1096,7 +1096,7 @@ PHP_FUNCTION(pdf_rotate) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1123,12 +1123,12 @@ PHP_FUNCTION(pdf_setflat) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 100) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); + php_error(E_WARNING,"Parameter of pdf_setflat() has to between 0 and 100"); RETURN_FALSE; } @@ -1155,12 +1155,12 @@ PHP_FUNCTION(pdf_setlinejoin) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); + php_error(E_WARNING,"Parameter of pdf_setlinejoin() has to between 0 and 2"); RETURN_FALSE; } @@ -1187,12 +1187,12 @@ PHP_FUNCTION(pdf_setlinecap) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if((arg2->value.lval > 2) && (arg2->value.lval < 0)) { - php3_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); + php_error(E_WARNING,"Parameter of pdf_setlinecap() has to be > 0 and =< 2"); RETURN_FALSE; } @@ -1219,12 +1219,12 @@ PHP_FUNCTION(pdf_setmiterlimit) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } if(arg2->value.dval < 1) { - php3_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); + php_error(E_WARNING,"Parameter of pdf_setmiterlimit() has to be >= 1"); RETURN_FALSE; } @@ -1251,7 +1251,7 @@ PHP_FUNCTION(pdf_setlinewidth) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1279,7 +1279,7 @@ PHP_FUNCTION(pdf_setdash) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1307,7 +1307,7 @@ PHP_FUNCTION(pdf_moveto) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1339,7 +1339,7 @@ PHP_FUNCTION(pdf_curveto) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1372,7 +1372,7 @@ PHP_FUNCTION(pdf_lineto) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1401,7 +1401,7 @@ PHP_FUNCTION(pdf_circle) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1432,7 +1432,7 @@ PHP_FUNCTION(pdf_arc) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1462,7 +1462,7 @@ PHP_FUNCTION(pdf_rect) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1491,7 +1491,7 @@ PHP_FUNCTION(pdf_closepath) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1517,7 +1517,7 @@ PHP_FUNCTION(pdf_closepath_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1543,7 +1543,7 @@ PHP_FUNCTION(pdf_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1569,7 +1569,7 @@ PHP_FUNCTION(pdf_fill) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1595,7 +1595,7 @@ PHP_FUNCTION(pdf_fill_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1621,7 +1621,7 @@ PHP_FUNCTION(pdf_closepath_fill_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1647,7 +1647,7 @@ PHP_FUNCTION(pdf_endpath) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1673,7 +1673,7 @@ PHP_FUNCTION(pdf_clip) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1700,7 +1700,7 @@ PHP_FUNCTION(pdf_setgray_fill) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1727,7 +1727,7 @@ PHP_FUNCTION(pdf_setgray_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1754,7 +1754,7 @@ PHP_FUNCTION(pdf_setgray) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1783,7 +1783,7 @@ PHP_FUNCTION(pdf_setrgbcolor_fill) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1812,7 +1812,7 @@ PHP_FUNCTION(pdf_setrgbcolor_stroke) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1841,7 +1841,7 @@ PHP_FUNCTION(pdf_setrgbcolor) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1885,7 +1885,7 @@ PHP_FUNCTION(pdf_add_outline) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find document identifier %d",id); + php_error(E_WARNING,"Unable to find document identifier %d",id); RETURN_FALSE; } @@ -1896,7 +1896,7 @@ PHP_FUNCTION(pdf_add_outline) { if (id > 0) { parent = zend_list_find(id, &type); if (!parent || (type != PDF_GLOBAL(le_outline))) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } else { parentid = *parent; @@ -1940,7 +1940,7 @@ PHP_FUNCTION(pdf_set_transition) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -1995,7 +1995,7 @@ PHP_FUNCTION(pdf_set_duration) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2023,14 +2023,14 @@ PHP_FUNCTION(pdf_open_gif) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } pdf_image = PDF_open_GIF(pdf, arg2->value.str.val); if(pdf_image < 0) { - php3_error(E_WARNING, "Could not open image"); + php_error(E_WARNING, "Could not open image"); RETURN_FALSE; } @@ -2057,14 +2057,14 @@ PHP_FUNCTION(pdf_open_jpeg) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } pdf_image = PDF_open_JPEG(pdf, arg2->value.str.val); if(pdf_image < 0) { - php3_error(E_WARNING, "Could not open image"); + php_error(E_WARNING, "Could not open image"); RETURN_FALSE; } @@ -2094,7 +2094,7 @@ PHP_FUNCTION(pdf_open_memory_image) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2102,7 +2102,7 @@ PHP_FUNCTION(pdf_open_memory_image) { gid=argv[1]->value.lval; im = zend_list_find(gid, &type); if (!im || type != phpi_get_le_gd()) { - php3_error(E_WARNING, "pdf: Unable to find image pointer"); + php_error(E_WARNING, "pdf: Unable to find image pointer"); RETURN_FALSE; } @@ -2129,7 +2129,7 @@ PHP_FUNCTION(pdf_open_memory_image) { efree(buffer); if(-1 == pdf_image) { - php3_error(E_WARNING, "Could not open image"); + php_error(E_WARNING, "Could not open image"); efree(buffer); RETURN_FALSE; } @@ -2157,7 +2157,7 @@ PHP_FUNCTION(pdf_close_image) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2165,7 +2165,7 @@ PHP_FUNCTION(pdf_close_image) { id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2192,7 +2192,7 @@ PHP_FUNCTION(pdf_place_image) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2200,7 +2200,7 @@ PHP_FUNCTION(pdf_place_image) { id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2234,7 +2234,7 @@ PHP_FUNCTION(pdf_put_image) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2242,7 +2242,7 @@ PHP_FUNCTION(pdf_put_image) { id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2273,7 +2273,7 @@ PHP_FUNCTION(pdf_execute_image) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2281,7 +2281,7 @@ PHP_FUNCTION(pdf_execute_image) { id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2313,7 +2313,7 @@ PHP_FUNCTION(pdf_get_image_width) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2321,7 +2321,7 @@ PHP_FUNCTION(pdf_get_image_width) { id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2349,7 +2349,7 @@ PHP_FUNCTION(pdf_get_image_height) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2357,7 +2357,7 @@ PHP_FUNCTION(pdf_get_image_height) { id=arg2->value.lval; pdf_image = (int) zend_list_find(id,&type); if(pdf_image < 0 || type!=PDF_GLOBAL(le_pdf_image)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } @@ -2388,7 +2388,7 @@ PHP_FUNCTION(pdf_add_weblink) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2421,7 +2421,7 @@ PHP_FUNCTION(pdf_add_pdflink) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2449,7 +2449,7 @@ PHP_FUNCTION(pdf_set_border_style) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2478,7 +2478,7 @@ PHP_FUNCTION(pdf_set_border_color) { id=arg1->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find file identifier %d",id); + php_error(E_WARNING,"Unable to find file identifier %d",id); RETURN_FALSE; } @@ -2512,7 +2512,7 @@ PHP_FUNCTION(pdf_add_annotation) { id=argv[0]->value.lval; pdf = zend_list_find(id,&type); if(!pdf || type!=PDF_GLOBAL(le_pdf)) { - php3_error(E_WARNING,"Unable to find identifier %d",id); + php_error(E_WARNING,"Unable to find identifier %d",id); RETURN_FALSE; } diff --git a/ext/pdf/php_pdf.h b/ext/pdf/php_pdf.h index 9ca3c0ae5e..53eb804fec 100644 --- a/ext/pdf/php_pdf.h +++ b/ext/pdf/php_pdf.h @@ -37,7 +37,7 @@ extern int le_fp; -extern php3_module_entry pdf_module_entry; +extern zend_module_entry pdf_module_entry; #define pdf_module_ptr &pdf_module_entry extern PHP_MINFO_FUNCTION(pdf); diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index f2698281e6..ef5e864b40 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -74,12 +74,12 @@ function_entry pgsql_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry pgsql_module_entry = { +zend_module_entry pgsql_module_entry = { "PostgreSQL", pgsql_functions, php3_minit_pgsql, NULL, php3_rinit_pgsql, NULL, NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -PHP_PGSQL_API php3_module_entry *get_module() { return &pgsql_module_entry; } +PHP_PGSQL_API zend_module_entry *get_module() { return &pgsql_module_entry; } #endif static int le_link,le_plink,le_result,le_lofp,le_string; diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h index 0397ab9a9e..71fdd628cf 100644 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@ -39,7 +39,7 @@ #if HAVE_PGSQL -extern php3_module_entry pgsql_module_entry; +extern zend_module_entry pgsql_module_entry; #define pgsql_module_ptr &pgsql_module_entry diff --git a/ext/posix/php_posix.h b/ext/posix/php_posix.h index 7dcc21fc85..a6cda8b48b 100644 --- a/ext/posix/php_posix.h +++ b/ext/posix/php_posix.h @@ -42,7 +42,7 @@ #define DLEXPORT #endif -extern php3_module_entry posix_module_entry; +extern zend_module_entry posix_module_entry; #define posix_module_ptr &posix_module_entry PHP_FUNCTION(posix_kill); diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 248c08e62f..cc8efdd154 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -117,7 +117,7 @@ function_entry posix_functions[] = { static PHP_MINFO_FUNCTION(posix); -php3_module_entry posix_module_entry = { +zend_module_entry posix_module_entry = { "Posix", posix_functions, NULL, @@ -129,7 +129,7 @@ php3_module_entry posix_module_entry = { }; #ifdef COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &posix__module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &posix__module_entry; } #endif #if APACHE @@ -159,7 +159,7 @@ PHP_FUNCTION(posix_kill) result = kill(pid->value.lval, sig->value.lval); if (result< 0) { - php3_error(E_WARNING, "posix_kill(%d, %d) failed with '%s'", + php_error(E_WARNING, "posix_kill(%d, %d) failed with '%s'", pid->value.lval, sig->value.lval, strerror(errno)); @@ -251,7 +251,7 @@ PHP_FUNCTION(posix_setuid) result = setuid(uid->value.lval); if (result < 0) { - php3_error(E_WARNING, "posix_setuid(%d) failed with '%s'. Must be root", + php_error(E_WARNING, "posix_setuid(%d) failed with '%s'. Must be root", uid->value.lval, strerror(errno)); RETURN_FALSE; @@ -276,7 +276,7 @@ PHP_FUNCTION(posix_setgid) result = setgid(gid->value.lval); if (result < 0) { - php3_error(E_WARNING, "posix_setgid(%d) failed with '%s'. Must be root", + php_error(E_WARNING, "posix_setgid(%d) failed with '%s'. Must be root", gid->value.lval, strerror(errno)); RETURN_FALSE; @@ -296,7 +296,7 @@ PHP_FUNCTION(posix_getgroups) result = getgroups(NGROUPS_MAX, gidlist); if (result < 0) { - php3_error(E_WARNING, "posix_getgroups() failed with '%s'", + php_error(E_WARNING, "posix_getgroups() failed with '%s'", strerror(errno)); RETURN_FALSE; } @@ -319,7 +319,7 @@ PHP_FUNCTION(posix_getlogin) p = getlogin(); if (p == NULL) { - php3_error(E_WARNING, "Cannot determine your login name. Something is really wrong here."); + php_error(E_WARNING, "Cannot determine your login name. Something is really wrong here."); RETURN_FALSE; } @@ -370,7 +370,7 @@ PHP_FUNCTION(posix_setpgid) result = setpgid(pid->value.lval, pgid->value.lval); if (result< 0) { - php3_error(E_WARNING, "posix_setpgid(%d, %d) failed with '%s'", + php_error(E_WARNING, "posix_setpgid(%d, %d) failed with '%s'", pid->value.lval, pgid->value.lval, strerror(errno)); @@ -396,7 +396,7 @@ PHP_FUNCTION(posix_getpgid) convert_to_long(pid); pgid = getpgid(pid->value.lval); if (pgid < 0) { - php3_error(E_WARNING, "posix_getpgid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getpgid(%d) failed with '%s'", pid->value.lval, strerror(errno)); RETURN_FALSE; @@ -425,7 +425,7 @@ PHP_FUNCTION(posix_getsid) convert_to_long(pid); sid = getsid(pid->value.lval); if (sid < 0) { - php3_error(E_WARNING, "posix_getsid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getsid(%d) failed with '%s'", pid->value.lval, strerror(errno)); RETURN_FALSE; @@ -471,7 +471,7 @@ PHP_FUNCTION(posix_times) ticks = times(&t); if (ticks < 0) { - php3_error(E_WARNING, "posix_times failed with '%s'", + php_error(E_WARNING, "posix_times failed with '%s'", strerror(errno)); } @@ -500,7 +500,7 @@ PHP_FUNCTION(posix_ctermid) p = ctermid(buffer); if (p == NULL) { - php3_error(E_WARNING, "posix_ctermid() failed with '%s'", + php_error(E_WARNING, "posix_ctermid() failed with '%s'", strerror(errno)); RETURN_FALSE; } @@ -526,7 +526,7 @@ PHP_FUNCTION(posix_ttyname) p = ttyname(fd->value.lval); if (p == NULL) { - php3_error(E_WARNING, "posix_ttyname(%d) failed with '%s'", + php_error(E_WARNING, "posix_ttyname(%d) failed with '%s'", fd->value.lval, strerror(errno)); RETURN_FALSE; @@ -574,7 +574,7 @@ PHP_FUNCTION(posix_getcwd) p = getcwd(buffer, MAXPATHLEN); if (!p) { - php3_error(E_WARNING, "posix_getcwd() failed with '%s'", + php_error(E_WARNING, "posix_getcwd() failed with '%s'", strerror(errno)); RETURN_FALSE; } @@ -609,7 +609,7 @@ PHP_FUNCTION(posix_mkfifo) } result = mkfifo(path->value.str.val, mode->value.lval); if (result < 0) { - php3_error(E_WARNING, "posix_mkfifo(%s) failed with '%s'", + php_error(E_WARNING, "posix_mkfifo(%s) failed with '%s'", path->value.str.val, strerror(errno)); RETURN_FALSE; @@ -652,7 +652,7 @@ PHP_FUNCTION(posix_getgrnam) g = getgrnam(name->value.str.val); if (!g) { - php3_error(E_WARNING, "posix_getgrnam(%s) failed with '%s'", + php_error(E_WARNING, "posix_getgrnam(%s) failed with '%s'", name->value.str.val, strerror(errno)); RETURN_FALSE; @@ -688,7 +688,7 @@ PHP_FUNCTION(posix_getgrgid) g = getgrgid(gid->value.lval); if (!g) { - php3_error(E_WARNING, "posix_getgrgid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getgrgid(%d) failed with '%s'", gid->value.lval, strerror(errno)); RETURN_FALSE; @@ -720,7 +720,7 @@ PHP_FUNCTION(posix_getpwnam) pw = getpwnam(name->value.str.val); if (!pw) { - php3_error(E_WARNING, "posix_getpwnam(%s) failed with '%s'", + php_error(E_WARNING, "posix_getpwnam(%s) failed with '%s'", name->value.str.val, strerror(errno)); RETURN_FALSE; @@ -752,7 +752,7 @@ PHP_FUNCTION(posix_getpwuid) pw = getpwuid(uid->value.lval); if (!pw) { - php3_error(E_WARNING, "posix_getpwuid(%d) failed with '%s'", + php_error(E_WARNING, "posix_getpwuid(%d) failed with '%s'", uid->value.lval, strerror(errno)); RETURN_FALSE; @@ -783,7 +783,7 @@ static int posix_addlimit(int limit, char *name, pval *return_value) { result = getrlimit(limit, &rl); if (result < 0) { - php3_error(E_WARNING, "posix_getrlimit failed to getrlimit(RLIMIT_CORE with '%s'", strerror(errno)); + php_error(E_WARNING, "posix_getrlimit failed to getrlimit(RLIMIT_CORE with '%s'", strerror(errno)); return FAILURE; } diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index 2b0308f6b4..c761e34101 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -433,7 +433,7 @@ static PHP_MINFO_FUNCTION(java) { DISPLAY_INI_ENTRIES(); } -php3_module_entry java_module_entry = { +zend_module_entry java_module_entry = { "java", java_functions, PHP_MINIT(java), diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h index 46fbc7e961..3c618279ba 100644 --- a/ext/snmp/php_snmp.h +++ b/ext/snmp/php_snmp.h @@ -31,7 +31,7 @@ #define DLEXPORT #endif -extern php3_module_entry snmp_module_entry; +extern zend_module_entry snmp_module_entry; #define snmp_module_ptr &snmp_module_entry extern int php3i_snmp_init(INIT_FUNC_ARGS); diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index c5a2d3faca..7d696021de 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -84,12 +84,12 @@ function_entry snmp_functions[] = { {NULL,NULL,NULL} }; -php3_module_entry snmp_module_entry = { +zend_module_entry snmp_module_entry = { "SNMP",snmp_functions,php3i_snmp_init,NULL,NULL,NULL,php3_info_snmp,STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &snmp_module_entry; }; +DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; }; #endif /* THREAD_LS snmp_module php3_snmp_module; - may need one of these at some point */ diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c index 9b176e5126..e18acc7dd6 100644 --- a/ext/snmp/winsnmp.c +++ b/ext/snmp/winsnmp.c @@ -28,12 +28,12 @@ function_entry snmp_functions[] = { {NULL,NULL,NULL} }; -php3_module_entry snmp_module_entry = { +zend_module_entry snmp_module_entry = { "SNMP",snmp_functions,NULL,NULL,NULL,NULL,NULL,0,0,0,NULL }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module() { return &snmp_module_entry; } +DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; } #endif #define GET 1 diff --git a/ext/standard/base64.c b/ext/standard/base64.c index 3f676ba8b9..9f95520703 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -68,7 +68,7 @@ unsigned char *php_base64_encode(const unsigned char *string, int length, int *r } /* as above, but backwards. :) */ -unsigned char *_php3_base64_decode(const unsigned char *string, int length, int *ret_length) { +unsigned char *php_base64_decode(const unsigned char *string, int length, int *ret_length) { const unsigned char *current = string; int ch, i = 0, j = 0, k; /* this sucks for threaded environments */ @@ -173,7 +173,7 @@ PHP_FUNCTION(base64_decode) { WRONG_PARAM_COUNT; } convert_to_string_ex(string); - result = _php3_base64_decode((*string)->value.str.val, (*string)->value.str.len, &ret_length); + result = php_base64_decode((*string)->value.str.val, (*string)->value.str.len, &ret_length); if (result != NULL) { return_value->value.str.val = result; return_value->value.str.len = ret_length; diff --git a/ext/standard/base64.h b/ext/standard/base64.h index 23d9ffd591..0352b4ab36 100644 --- a/ext/standard/base64.h +++ b/ext/standard/base64.h @@ -35,7 +35,7 @@ PHP_FUNCTION(base64_decode); PHP_FUNCTION(base64_encode); extern unsigned char *php_base64_encode(const unsigned char *, int, int *); -extern unsigned char *_php3_base64_decode(const unsigned char *, int, int *); +extern unsigned char *php_base64_decode(const unsigned char *, int, int *); #endif /* _BASE64_h */ diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 77264d4911..2a349b75fe 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -323,7 +323,7 @@ PHP_INI_BEGIN() PHP_INI_END() -php3_module_entry basic_functions_module = { +zend_module_entry basic_functions_module = { "Basic Functions", /* extension name */ basic_functions, /* function list */ PHP_MINIT(basic), /* process startup */ @@ -810,7 +810,7 @@ PHP_FUNCTION(get_magic_quotes_gpc) } -void php3_is_type(INTERNAL_FUNCTION_PARAMETERS,int type) +void php_is_type(INTERNAL_FUNCTION_PARAMETERS,int type) { pval **arg; @@ -827,37 +827,37 @@ void php3_is_type(INTERNAL_FUNCTION_PARAMETERS,int type) PHP_FUNCTION(is_resource) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE); } PHP_FUNCTION(is_bool) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL); } PHP_FUNCTION(is_long) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); } PHP_FUNCTION(is_double) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); } PHP_FUNCTION(is_string) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); } PHP_FUNCTION(is_array) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); } PHP_FUNCTION(is_object) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); } diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index cde57adcb7..174c64c6ea 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -38,7 +38,7 @@ #include "zend_highlight.h" -extern php3_module_entry basic_functions_module; +extern zend_module_entry basic_functions_module; #define basic_functions_module_ptr &basic_functions_module PHP_MINIT_FUNCTION(basic); @@ -68,7 +68,7 @@ PHP_FUNCTION(set_magic_quotes_runtime); PHP_FUNCTION(get_magic_quotes_runtime); PHP_FUNCTION(get_magic_quotes_gpc); -void php3_is_type(INTERNAL_FUNCTION_PARAMETERS, int type); +void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type); PHP_FUNCTION(is_resource); PHP_FUNCTION(is_bool); PHP_FUNCTION(is_long); diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 55dc0f049e..e5037f9b9e 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -33,7 +33,7 @@ function_entry browscap_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry browscap_module_entry = { +zend_module_entry browscap_module_entry = { "browscap", browscap_functions, PHP_MINIT(browscap), PHP_MSHUTDOWN(browscap), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index 48619c5a67..11383cc243 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -53,7 +53,7 @@ function_entry crypt_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry crypt_module_entry = { +zend_module_entry crypt_module_entry = { "Crypt", crypt_functions, PHP_MINIT(crypt), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 9239ea33c6..a69da0c957 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -102,7 +102,7 @@ static zend_function_entry php_dir_class_functions[] = { }; -php3_module_entry php3_dir_module_entry = { +zend_module_entry php3_dir_module_entry = { "PHP_dir", php_dir_functions, PHP_MINIT(dir), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/dl.c b/ext/standard/dl.c index e113249fd1..7e0e4e1f40 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -46,7 +46,7 @@ function_entry dl_functions[] = { }; -php3_module_entry dl_module_entry = { +zend_module_entry dl_module_entry = { "PHP_DL", dl_functions, NULL, NULL, NULL, NULL, PHP_MINFO(dl), STANDARD_MODULE_PROPERTIES }; @@ -84,8 +84,8 @@ void php_dl(pval *file,int type,pval *return_value) { void *handle; char libpath[MAXPATHLEN + 1]; - php3_module_entry *module_entry,*tmp; - php3_module_entry *(*get_module)(void); + zend_module_entry *module_entry,*tmp; + zend_module_entry *(*get_module)(void); PLS_FETCH(); if (cfg_get_string("extension_dir",&PG(extension_dir))==SUCCESS @@ -119,7 +119,7 @@ void php_dl(pval *file,int type,pval *return_value) #endif RETURN_FALSE; } - get_module = (php3_module_entry *(*)(void)) dlsym(handle, "get_module"); + get_module = (zend_module_entry *(*)(void)) dlsym(handle, "get_module"); if (!get_module) { dlclose(handle); diff --git a/ext/standard/dl.h b/ext/standard/dl.h index 6bf453d23e..399aa0bc51 100644 --- a/ext/standard/dl.h +++ b/ext/standard/dl.h @@ -40,7 +40,7 @@ void php_dl(pval *file,int type,pval *return_value); #ifdef HAVE_LIBDL -extern php3_module_entry dl_module_entry; +extern zend_module_entry dl_module_entry; #define dl_module_ptr &dl_module_entry /* dynamic loading functions */ diff --git a/ext/standard/file.c b/ext/standard/file.c index d8a312d4ce..606d347b84 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -865,7 +865,7 @@ PHP_FUNCTION(set_socket_blocking) if (_php3_set_sock_blocking(socketd, block) == FAILURE) RETURN_FALSE; - _php3_sock_set_blocking(socketd, block == 0 ? 0 : 1); + php_sockset_blocking(socketd, block == 0 ? 0 : 1); RETURN_TRUE; } diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 4a33ea7ff5..0d904e38f3 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -173,7 +173,7 @@ PHP_FUNCTION(diskfreespace) } } else { - php3_error(E_WARNING, "Unable to load kernel32.dll"); + php_error(E_WARNING, "Unable to load kernel32.dll"); RETURN_FALSE; } @@ -591,7 +591,7 @@ function_entry php3_filestat_functions[] = { }; -php3_module_entry php3_filestat_module_entry = { +zend_module_entry php3_filestat_module_entry = { "PHP_filestat", php3_filestat_functions, NULL, NULL, PHP_RINIT(filestat), PHP_RSHUTDOWN(filestat), NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index ffd53e3aca..f6b9600a1e 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -365,7 +365,7 @@ php_sprintf_getnumber(char *buffer, int *pos) * */ static char * -php3_formatted_print(int ht, int *len) +php_formatted_print(int ht, int *len) { pval ***args; int argc, size = 240, inpos = 0, outpos = 0; @@ -561,7 +561,7 @@ PHP_FUNCTION(user_sprintf) char *result; int len; - if ((result=php3_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht,&len))==NULL) { RETURN_FALSE; } RETVAL_STRINGL(result,len,1); @@ -576,7 +576,7 @@ PHP_FUNCTION(user_printf) char *result; int len; - if ((result=php3_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht,&len))==NULL) { RETURN_FALSE; } PHPWRITE(result,len); diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index 0cfdcc4947..2c68448bb0 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -111,7 +111,7 @@ struct php3i_sockbuf { typedef struct php3i_sockbuf php3i_sockbuf; -php3_module_entry fsock_module_entry = { +zend_module_entry fsock_module_entry = { "Socket functions", fsock_functions, PHP_MINIT(fsock), @@ -411,10 +411,10 @@ static void php_cleanup_sockbuf(int persistent FLS_DC) #define SOCK_FIND(sock,socket) \ php3i_sockbuf *sock; \ FLS_FETCH(); \ - sock = _php3_sock_find(socket FLS_CC); \ - if(!sock) sock = _php3_sock_create(socket FLS_CC) + sock = php_sockfind(socket FLS_CC); \ + if(!sock) sock = php_sockcreate(socket FLS_CC) -static php3i_sockbuf *_php3_sock_find(int socket FLS_DC) +static php3i_sockbuf *php_sockfind(int socket FLS_DC) { php3i_sockbuf *buf = NULL, *tmp; @@ -427,7 +427,7 @@ static php3i_sockbuf *_php3_sock_find(int socket FLS_DC) return buf; } -static php3i_sockbuf *_php3_sock_create(int socket FLS_DC) +static php3i_sockbuf *php_sockcreate(int socket FLS_DC) { php3i_sockbuf *sock; int persistent = _php3_is_persistent_sock(socket); @@ -457,13 +457,13 @@ size_t php_sock_set_def_chunk_size(size_t size) return old; } -int _php3_sock_destroy(int socket) +int php_sockdestroy(int socket) { int ret = 0; php3i_sockbuf *sock; FLS_FETCH(); - sock = _php3_sock_find(socket FLS_CC); + sock = php_sockfind(socket FLS_CC); if(sock) { ret = 1; SOCK_DESTROY(sock); @@ -490,7 +490,7 @@ int php_sock_close(int socket) php3i_sockbuf *sock; FLS_FETCH(); - sock = _php3_sock_find(socket FLS_CC); + sock = php_sockfind(socket FLS_CC); if(sock) { if(!sock->persistent) { SOCK_CLOSE(sock->socket); @@ -505,7 +505,7 @@ int php_sock_close(int socket) #define MAX_CHUNKS_PER_READ 10 -static void _php3_sock_wait_for_data(php3i_sockbuf *sock) +static void php_sockwait_for_data(php3i_sockbuf *sock) { fd_set fdr, tfdr; @@ -519,7 +519,7 @@ static void _php3_sock_wait_for_data(php3i_sockbuf *sock) } } -static size_t _php3_sock_read_internal(php3i_sockbuf *sock) +static size_t php_sockread_internal(php3i_sockbuf *sock) { char buf[CHUNK_SIZE]; int nr_bytes; @@ -534,7 +534,7 @@ static size_t _php3_sock_read_internal(php3i_sockbuf *sock) if(sock->is_blocked) { - _php3_sock_wait_for_data(sock); + php_sockwait_for_data(sock); } /* read at a maximum sock->chunk_size */ @@ -555,21 +555,21 @@ static size_t _php3_sock_read_internal(php3i_sockbuf *sock) return nr_read; } -static void _php3_sock_read_total(php3i_sockbuf *sock, size_t maxread) +static void php_sockread_total(php3i_sockbuf *sock, size_t maxread) { while(!sock->eof && TOREAD(sock) < maxread) { - _php3_sock_read_internal(sock); + php_sockread_internal(sock); } } -static size_t _php3_sock_read(php3i_sockbuf *sock) +static size_t php_sockread(php3i_sockbuf *sock) { size_t nr_bytes; size_t nr_read = 0; int i; for(i = 0; !sock->eof && i < MAX_CHUNKS_PER_READ; i++) { - nr_bytes = _php3_sock_read_internal(sock); + nr_bytes = php_sockread_internal(sock); if(nr_bytes == 0) break; nr_read += nr_bytes; } @@ -577,7 +577,7 @@ static size_t _php3_sock_read(php3i_sockbuf *sock) return nr_read; } -int _php3_sock_set_blocking(int socket, int mode) +int php_sockset_blocking(int socket, int mode) { int old; SOCK_FIND(sock, socket); @@ -591,7 +591,7 @@ int _php3_sock_set_blocking(int socket, int mode) #define SOCK_FIND_AND_READ_MAX(max) \ SOCK_FIND(sock, socket); \ - if(sock->is_blocked) _php3_sock_read_total(sock, max); else _php3_sock_read(sock) + if(sock->is_blocked) php_sockread_total(sock, max); else php_sockread(sock) /* {{{ php_sock_fgets() */ /* @@ -614,11 +614,11 @@ char *php_sock_fgets(char *buf, size_t maxlen, int socket) if(!p) { if(sock->is_blocked) { while(!p && !sock->eof && TOREAD(sock) < maxlen) { - _php3_sock_read_internal(sock); + php_sockread_internal(sock); SEARCHCR(); } } else { - _php3_sock_read(sock); + php_sockread(sock); SEARCHCR(); } } @@ -674,7 +674,7 @@ int php_sock_feof(int socket) SOCK_FIND(sock, socket); if(!sock->is_blocked) - _php3_sock_read(sock); + php_sockread(sock); if(!TOREAD(sock) && sock->eof) ret = 1; diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h index 04108580b8..06ff385dc4 100644 --- a/ext/standard/fsock.h +++ b/ext/standard/fsock.h @@ -55,7 +55,7 @@ #include <sys/time.h> #endif -extern php3_module_entry fsock_module_entry; +extern zend_module_entry fsock_module_entry; #define phpext_fsock_ptr &fsock_module_entry PHP_FUNCTION(fsockopen); @@ -66,8 +66,8 @@ size_t php_sock_fread(char *buf, size_t maxlen, int socket); int php_sock_feof(int socket); int php_sock_fgetc(int socket); int _php3_is_persistent_sock(int); -int _php3_sock_set_blocking(int socket, int mode); -int _php3_sock_destroy(int socket); +int php_sockset_blocking(int socket, int mode); +int php_sockdestroy(int socket); int php_sock_close(int socket); size_t php_sock_set_def_chunk_size(size_t size); int php_msock_destroy(int *data); diff --git a/ext/standard/head.c b/ext/standard/head.c index 5bc39e5a3a..39fec956af 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -573,7 +573,7 @@ function_entry php_header_functions[] = { }; -php3_module_entry php_header_module_entry = { +zend_module_entry php_header_module_entry = { "PHP_head", php_header_functions, NULL, NULL, PHP_RINIT(head), NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/head.h b/ext/standard/head.h index df5aceb6fe..10d1a53603 100644 --- a/ext/standard/head.h +++ b/ext/standard/head.h @@ -49,7 +49,7 @@ typedef struct CookieList { struct CookieList *next; } CookieList; -extern php3_module_entry php_header_module_entry; +extern zend_module_entry php_header_module_entry; #define php_header_module_ptr &php_header_module_entry extern PHP_RINIT_FUNCTION(head); diff --git a/ext/standard/mail.c b/ext/standard/mail.c index db4988a659..90e3d5696d 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -44,13 +44,13 @@ function_entry mail_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry mail_module_entry = { +zend_module_entry mail_module_entry = { "Sendmail", mail_functions, NULL, NULL, NULL, NULL, PHP_MINFO(mail), STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &odbc_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &odbc_module_entry; } #endif /* {{{ proto int mail(string to, string subject, string message [, string additional_headers]) diff --git a/ext/standard/output.c b/ext/standard/output.c index 721379471b..55ecb43f33 100644 --- a/ext/standard/output.c +++ b/ext/standard/output.c @@ -107,7 +107,7 @@ static zend_function_entry php_output_functions[] = { PHP_RINIT_FUNCTION(output); PHP_RSHUTDOWN_FUNCTION(output); -php3_module_entry output_module_entry = { +zend_module_entry output_module_entry = { "PHP_output", php_output_functions, NULL, /* extension-wide startup function */ diff --git a/ext/standard/pack.c b/ext/standard/pack.c index af6ad58f5d..7d5d9be654 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -56,7 +56,7 @@ function_entry pack_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry pack_module_entry = { +zend_module_entry pack_module_entry = { "PHP_pack", pack_functions, PHP_MINIT(pack), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES }; diff --git a/ext/standard/pack.h b/ext/standard/pack.h index bad1af9cfe..98900415bc 100644 --- a/ext/standard/pack.h +++ b/ext/standard/pack.h @@ -32,7 +32,7 @@ #ifndef _PACK_H #define _PACK_H -extern php3_module_entry pack_module_entry; +extern zend_module_entry pack_module_entry; #define pack_module_ptr &pack_module_entry extern PHP_MINIT_FUNCTION(pack); diff --git a/ext/standard/php_browscap.h b/ext/standard/php_browscap.h index 338272692e..a3706952c0 100644 --- a/ext/standard/php_browscap.h +++ b/ext/standard/php_browscap.h @@ -31,7 +31,7 @@ #ifndef _PHP_BROWSCAP_H #define _PHP_BROWSCAP_H -extern php3_module_entry browscap_module_entry; +extern zend_module_entry browscap_module_entry; #define browscap_module_ptr &browscap_module_entry extern PHP_MINIT_FUNCTION(browscap); diff --git a/ext/standard/php_crypt.h b/ext/standard/php_crypt.h index 1b93431cb5..94dbfb40f8 100644 --- a/ext/standard/php_crypt.h +++ b/ext/standard/php_crypt.h @@ -2,7 +2,7 @@ #define PHP_CRYPT_H #if HAVE_CRYPT -extern php3_module_entry crypt_module_entry; +extern zend_module_entry crypt_module_entry; #define crypt_module_ptr &crypt_module_entry PHP_FUNCTION(crypt); extern PHP_MINIT_FUNCTION(crypt); diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h index bb09e2fbdd..3b3c74fe8c 100644 --- a/ext/standard/php_dir.h +++ b/ext/standard/php_dir.h @@ -21,7 +21,7 @@ #ifndef _PHP_DIR_H #define _PHP_DIR_H -extern php3_module_entry php3_dir_module_entry; +extern zend_module_entry php3_dir_module_entry; #define php3_dir_module_ptr &php3_dir_module_entry /* directory functions */ diff --git a/ext/standard/php_filestat.h b/ext/standard/php_filestat.h index 05003fa807..33ab79a59d 100644 --- a/ext/standard/php_filestat.h +++ b/ext/standard/php_filestat.h @@ -61,7 +61,7 @@ PHP_FUNCTION(chmod); PHP_FUNCTION(touch); PHP_FUNCTION(clearstatcache); -extern php3_module_entry php3_filestat_module_entry; +extern zend_module_entry php3_filestat_module_entry; #define php3_filestat_module_ptr &php3_filestat_module_entry #define phpext_filestat_ptr php3_filestat_module_ptr diff --git a/ext/standard/php_mail.h b/ext/standard/php_mail.h index 918bcbdf1c..cd8ac30b5c 100644 --- a/ext/standard/php_mail.h +++ b/ext/standard/php_mail.h @@ -33,7 +33,7 @@ #ifndef _MAIL_H #define _MAIL_H #if HAVE_SENDMAIL -extern php3_module_entry mail_module_entry; +extern zend_module_entry mail_module_entry; #define mail_module_ptr &mail_module_entry PHP_FUNCTION(mail); diff --git a/ext/standard/php_syslog.h b/ext/standard/php_syslog.h index 69dd4abb80..01a94eb6d3 100644 --- a/ext/standard/php_syslog.h +++ b/ext/standard/php_syslog.h @@ -32,7 +32,7 @@ #define _PHP_SYSLOG_H #if HAVE_SYSLOG_H -extern php3_module_entry syslog_module_entry; +extern zend_module_entry syslog_module_entry; #define syslog_module_ptr &syslog_module_entry extern PHP_MINIT_FUNCTION(syslog); diff --git a/ext/standard/reg.h b/ext/standard/reg.h index c261abf4d2..6b03d641ee 100644 --- a/ext/standard/reg.h +++ b/ext/standard/reg.h @@ -33,7 +33,7 @@ #ifndef _REG_H #define _REG_H -extern php3_module_entry regexp_module_entry; +extern zend_module_entry regexp_module_entry; #define regexp_module_ptr ®exp_module_entry char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase, int extended); diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c index 2154212ce7..aaec497fd9 100644 --- a/ext/standard/syslog.c +++ b/ext/standard/syslog.c @@ -265,13 +265,13 @@ function_entry syslog_functions[] = { }; -php3_module_entry syslog_module_entry = { +zend_module_entry syslog_module_entry = { "Syslog", syslog_functions, PHP_MINIT(syslog), NULL, PHP_RINIT(syslog), PHP_RSHUTDOWN(syslog), NULL, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -DLEXPORT php3_module_entry *get_module(void) { return &syslog_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &syslog_module_entry; } #endif diff --git a/ext/sybase/php_sybase.h b/ext/sybase/php_sybase.h index 1ce140d324..215d87e8ed 100644 --- a/ext/sybase/php_sybase.h +++ b/ext/sybase/php_sybase.h @@ -40,7 +40,7 @@ #if HAVE_SYBASE -extern php3_module_entry sybase_module_entry; +extern zend_module_entry sybase_module_entry; #define sybase_module_ptr &sybase_module_entry extern int php3_minit_sybase(INIT_FUNC_ARGS); diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c index 3941b51b5e..ce677a880f 100644 --- a/ext/sybase/sybase.c +++ b/ext/sybase/sybase.c @@ -78,12 +78,12 @@ function_entry sybase_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry sybase_module_entry = { +zend_module_entry sybase_module_entry = { "Sybase SQL", sybase_functions, php3_minit_sybase, php3_mshutdown_sybase, php3_rinit_sybase, php3_rshutdown_sybase, php3_info_sybase, STANDARD_MODULE_PROPERTIES }; #if COMPILE_DL -php3_module_entry *get_module() { return &sybase_module_entry; } +zend_module_entry *get_module() { return &sybase_module_entry; } #endif THREAD_LS sybase_module php3_sybase_module; diff --git a/ext/sysvsem/php_sysvsem.h b/ext/sysvsem/php_sysvsem.h index 1d3342ab70..4fc517f9dd 100644 --- a/ext/sysvsem/php_sysvsem.h +++ b/ext/sysvsem/php_sysvsem.h @@ -40,7 +40,7 @@ #if HAVE_SYSVSEM -extern php3_module_entry sysvsem_module_entry; +extern zend_module_entry sysvsem_module_entry; #define sysvsem_module_ptr &sysvsem_module_entry extern int php3_minit_sysvsem(INIT_FUNC_ARGS); diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 8a9b3352b1..b8d9592e4a 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -61,7 +61,7 @@ zend_module_entry sysvsem_module_entry = { }; #if COMPILE_DL -php3_module_entry *get_module() { return &sysvsem_module_entry; } +zend_module_entry *get_module() { return &sysvsem_module_entry; } #endif diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h index 7cbdb34fd2..cc7d11db25 100644 --- a/ext/sysvshm/php_sysvshm.h +++ b/ext/sysvshm/php_sysvshm.h @@ -41,7 +41,7 @@ #if HAVE_SYSVSHM -extern php3_module_entry sysvshm_module_entry; +extern zend_module_entry sysvshm_module_entry; #define sysvshm_module_ptr &sysvshm_module_entry #include <sys/types.h> diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 7acb7747a1..f457db4e29 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -51,7 +51,7 @@ zend_module_entry sysvshm_module_entry = { #if COMPILE_DL -php3_module_entry *get_module() { return &sysvshm_module_entry; } +zend_module_entry *get_module() { return &sysvshm_module_entry; } #endif diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 07ef8291b7..b904a3eb28 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -80,7 +80,7 @@ typedef struct { } xml_encoding; -extern php3_module_entry xml_module_entry; +extern zend_module_entry xml_module_entry; # define xml_module_ptr &xml_module_entry enum php3_xml_option { diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 6f49e05014..88a8142d56 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -121,7 +121,7 @@ function_entry xml_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry xml_module_entry = { +zend_module_entry xml_module_entry = { "XML", /* extension name */ xml_functions, /* extension function list */ PHP_MINIT(xml), /* extension-wide startup function */ diff --git a/ext/yp/php_yp.h b/ext/yp/php_yp.h index d042b7afac..39d849e209 100644 --- a/ext/yp/php_yp.h +++ b/ext/yp/php_yp.h @@ -38,7 +38,7 @@ #if HAVE_YP -extern php3_module_entry yp_module_entry; +extern zend_module_entry yp_module_entry; #define yp_module_ptr &yp_module_entry /* yp.c functions */ diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index 6046d1dad8..bc2397b781 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -39,7 +39,7 @@ typedef struct { int gzgetss_state; } php_zlib_globals; -extern php3_module_entry php3_zlib_module_entry; +extern zend_module_entry php3_zlib_module_entry; #define zlib_module_ptr &php3_zlib_module_entry extern PHP_MINIT_FUNCTION(zlib); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index a42a1bcc95..b0c6b39294 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -98,7 +98,7 @@ function_entry php3_zlib_functions[] = { {NULL, NULL, NULL} }; -php3_module_entry php3_zlib_module_entry = { +zend_module_entry php3_zlib_module_entry = { "zlib", php3_zlib_functions, PHP_MINIT(zlib), @@ -110,7 +110,7 @@ php3_module_entry php3_zlib_module_entry = { }; #if defined(COMPILE_DL) -DLEXPORT php3_module_entry *get_module(void) { return &php_zlib_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &php_zlib_module_entry; } #endif static void phpi_destructor_gzclose(gzFile *zp) { diff --git a/main/configuration-parser.y b/main/configuration-parser.y index aca4c2dda0..2be8e02cb4 100644 --- a/main/configuration-parser.y +++ b/main/configuration-parser.y @@ -50,7 +50,7 @@ static HashTable configuration_hash; extern HashTable browser_hash; PHPAPI extern char *php_ini_path; #endif -static HashTable *active_zend_hash_table; +static HashTable *activezend_hash_table; static pval *current_section; static char *currently_parsed_filename; @@ -230,7 +230,7 @@ int php_init_config(void) } init_cfg_scanner(); - active_zend_hash_table = &configuration_hash; + activezend_hash_table = &configuration_hash; parsing_mode = PARSING_MODE_CFG; currently_parsed_filename = "php.ini"; yyparse(); @@ -258,7 +258,7 @@ PHP_MINIT_FUNCTION(browscap) return FAILURE; } init_cfg_scanner(); - active_zend_hash_table = &browser_hash; + activezend_hash_table = &browser_hash; parsing_mode = PARSING_MODE_BROWSCAP; currently_parsed_filename = browscap; yyparse(); @@ -355,8 +355,8 @@ statement: #endif $3.type = IS_STRING; if (parsing_mode==PARSING_MODE_CFG) { - zend_hash_update(active_zend_hash_table, $1.value.str.val, $1.value.str.len+1, &$3, sizeof(pval), NULL); - if (active_zend_hash_table == &configuration_hash) { + zend_hash_update(activezend_hash_table, $1.value.str.val, $1.value.str.len+1, &$3, sizeof(pval), NULL); + if (activezend_hash_table == &configuration_hash) { php_alter_ini_entry($1.value.str.val, $1.value.str.len+1, $3.value.str.val, $3.value.str.len+1, PHP_INI_SYSTEM); } } else if (parsing_mode==PARSING_MODE_BROWSCAP) { @@ -406,7 +406,7 @@ statement: tmp.value.ht = (HashTable *) malloc(sizeof(HashTable)); zend_hash_init(tmp.value.ht, 0, NULL, (int (*)(void *))pvalue_config_destructor, 1); tmp.type = IS_OBJECT; - zend_hash_update(active_zend_hash_table, $1.value.str.val, $1.value.str.len+1, (void *) &tmp, sizeof(pval), (void **) ¤t_section); + zend_hash_update(activezend_hash_table, $1.value.str.val, $1.value.str.len+1, (void *) &tmp, sizeof(pval), (void **) ¤t_section); tmp.value.str.val = zend_strndup($1.value.str.val,$1.value.str.len); tmp.value.str.len = $1.value.str.len; tmp.type = IS_STRING; diff --git a/main/main.c b/main/main.c index 2d0aee4991..2d650e803b 100644 --- a/main/main.c +++ b/main/main.c @@ -887,6 +887,7 @@ int php_module_startup(sapi_module_struct *sf) zend_utility_functions zuf; zend_utility_values zuv; int module_number=0; /* for REGISTER_INI_ENTRIES() */ + char *php_os; #ifdef ZTS zend_executor_globals *executor_globals; php_core_globals *core_globals; @@ -896,6 +897,16 @@ int php_module_startup(sapi_module_struct *sf) WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; #endif +#if WIN32|WINNT + /* Get build numbers for Windows NT or Win95 */ + if (dwVersion < 0x80000000){ + php_os="WINNT"; + } else { + php_os="WIN32"; + } +#else + php_os=PHP_OS; +#endif global_lock_init(); SG(server_context) = NULL; @@ -963,6 +974,9 @@ int php_module_startup(sapi_module_struct *sf) zend_set_utility_values(&zuv); php_startup_SAPI_content_types(); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); + if (php_startup_internal_extensions() == FAILURE) { php_printf("Unable to start builtin modules\n"); return FAILURE; diff --git a/main/output.c b/main/output.c index 721379471b..55ecb43f33 100644 --- a/main/output.c +++ b/main/output.c @@ -107,7 +107,7 @@ static zend_function_entry php_output_functions[] = { PHP_RINIT_FUNCTION(output); PHP_RSHUTDOWN_FUNCTION(output); -php3_module_entry output_module_entry = { +zend_module_entry output_module_entry = { "PHP_output", php_output_functions, NULL, /* extension-wide startup function */ |