cvs: /php4/ext/standard basic_functions.c md5.c md5.h

zeev Fri Dec 17 15:51:32 1999 EDT Modified files: /php4/ext/standard basic_functions.c md5.c md5.h Log: More work on php3_ annihilation... Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.138 php4/ext/standard/basic_functions.c:1.140 --- php4/ext/standard/basic_functions.c:1.138 Fri Dec 17 14:16:47 1999 +++ php4/ext/standard/basic_functions.c Fri Dec 17 15:51:01 1999 @@ -50,14 +50,6 @@ #include "php_globals.h" #include "SAPI.h" -#if APACHE -/* - ap_compat.h does a - #define md5 ap_md5 - which "kills" out md5 function. -*/ -#undef md5 -#endif #ifdef ZTS int basic_globals_id; @@ -114,7 +106,7 @@ PHP_FE(htmlentities, NULL) PHP_FE(get_html_translation_table, NULL) - PHP_FE(md5, NULL) + PHP_NAMED_FE(md5, php_if_md5, NULL) PHP_FE(iptcparse, NULL) PHP_FE(iptcembed, NULL) @@ -323,7 +315,7 @@ PHP_INI_END() -php3_module_entry basic_functions_module = { +zend_module_entry basic_functions_module = { "Basic Functions", /* extension name */ basic_functions, /* function list */ PHP_MINIT(basic), /* process startup */ @@ -810,7 +802,7 @@ } -void php3_is_type(INTERNAL_FUNCTION_PARAMETERS,int type) +void php_is_type(INTERNAL_FUNCTION_PARAMETERS,int type) { pval **arg; @@ -827,37 +819,37 @@ PHP_FUNCTION(is_resource) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_RESOURCE); } PHP_FUNCTION(is_bool) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_BOOL); } PHP_FUNCTION(is_long) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG); } PHP_FUNCTION(is_double) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_DOUBLE); } PHP_FUNCTION(is_string) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_STRING); } PHP_FUNCTION(is_array) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_ARRAY); } PHP_FUNCTION(is_object) { - php3_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); + php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_OBJECT); } Index: php4/ext/standard/md5.c diff -u php4/ext/standard/md5.c:1.6 php4/ext/standard/md5.c:1.7 --- php4/ext/standard/md5.c:1.6 Fri Sep 24 15:35:25 1999 +++ php4/ext/standard/md5.c Fri Dec 17 15:51:01 1999 @@ -27,7 +27,7 @@ /* {{{ proto string md5(string str) Calculate the md5 hash of a string */ -PHP_FUNCTION(md5) +PHP_NAMED_FUNCTION(php_if_md5) { pval **arg; char md5str[33]; Index: php4/ext/standard/md5.h diff -u php4/ext/standard/md5.h:1.2 php4/ext/standard/md5.h:1.3 --- php4/ext/standard/md5.h:1.2 Sun May 16 07:19:26 1999 +++ php4/ext/standard/md5.h Fri Dec 17 15:51:01 1999 @@ -66,6 +66,6 @@ void PHP3_MD5Update PROTO_LIST((PHP3_MD5_CTX *, const unsigned char *, unsigned int)); void PHP3_MD5Final PROTO_LIST((unsigned char[16], PHP3_MD5_CTX *)); -PHP_FUNCTION(md5); +PHP_NAMED_FUNCTION(php_if_md5); #endif