From: Nikita Popov Date: Fri, 3 Apr 2020 13:10:30 +0000 (+0200) Subject: Remove now unnecessary PHP_FUNCTION() declarations X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bfcd8825c2e6ca6d32fe957cb4cdb185fd28d31;p=php Remove now unnecessary PHP_FUNCTION() declarations --- diff --git a/ext/standard/base64.h b/ext/standard/base64.h index 17bc45cd8b..170c0b0c61 100644 --- a/ext/standard/base64.h +++ b/ext/standard/base64.h @@ -57,9 +57,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -PHP_FUNCTION(base64_decode); -PHP_FUNCTION(base64_encode); - #if (ZEND_INTRIN_AVX2_FUNC_PTR || ZEND_INTRIN_SSSE3_FUNC_PTR) && !ZEND_INTRIN_AVX2_NATIVE PHP_MINIT_FUNCTION(base64_intrin); #endif diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index 003c0a2069..2805addcea 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -40,107 +40,8 @@ PHP_RINIT_FUNCTION(basic); PHP_RSHUTDOWN_FUNCTION(basic); PHP_MINFO_FUNCTION(basic); -PHP_FUNCTION(constant); -PHP_FUNCTION(sleep); -PHP_FUNCTION(usleep); -#if HAVE_NANOSLEEP -PHP_FUNCTION(time_nanosleep); -PHP_FUNCTION(time_sleep_until); -#endif -PHP_FUNCTION(flush); -#ifdef HAVE_INET_NTOP -PHP_FUNCTION(inet_ntop); -#endif -#ifdef HAVE_INET_PTON -PHP_FUNCTION(inet_pton); -#endif -PHP_FUNCTION(ip2long); -PHP_FUNCTION(long2ip); - -/* system functions */ -PHP_FUNCTION(getenv); -PHP_FUNCTION(putenv); - -PHP_FUNCTION(getopt); - -PHP_FUNCTION(get_current_user); -PHP_FUNCTION(set_time_limit); - -PHP_FUNCTION(header_register_callback); - -PHP_FUNCTION(get_cfg_var); - -PHP_FUNCTION(error_log); -PHP_FUNCTION(error_get_last); -PHP_FUNCTION(error_clear_last); - -PHP_FUNCTION(call_user_func); -PHP_FUNCTION(call_user_func_array); -PHP_FUNCTION(forward_static_call); -PHP_FUNCTION(forward_static_call_array); - -PHP_FUNCTION(register_shutdown_function); -PHP_FUNCTION(highlight_file); -PHP_FUNCTION(highlight_string); -PHP_FUNCTION(php_strip_whitespace); ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini); -PHP_FUNCTION(ini_get); -PHP_FUNCTION(ini_get_all); -PHP_FUNCTION(ini_set); -PHP_FUNCTION(ini_restore); -PHP_FUNCTION(get_include_path); -PHP_FUNCTION(set_include_path); - -PHP_FUNCTION(print_r); -PHP_FUNCTION(fprintf); -PHP_FUNCTION(vfprintf); - -PHP_FUNCTION(connection_aborted); -PHP_FUNCTION(connection_status); -PHP_FUNCTION(ignore_user_abort); - -PHP_FUNCTION(getservbyname); -PHP_FUNCTION(getservbyport); -PHP_FUNCTION(getprotobyname); -PHP_FUNCTION(getprotobynumber); - -PHP_FUNCTION(crc32); - -PHP_FUNCTION(register_tick_function); -PHP_FUNCTION(unregister_tick_function); -#ifdef HAVE_GETLOADAVG -PHP_FUNCTION(sys_getloadavg); -#endif - -PHP_FUNCTION(is_uploaded_file); -PHP_FUNCTION(move_uploaded_file); - -PHP_FUNCTION(net_get_interfaces); - -/* From the INI parser */ -PHP_FUNCTION(parse_ini_file); -PHP_FUNCTION(parse_ini_string); -#if ZEND_DEBUG -PHP_FUNCTION(config_get_hash); -#endif - -#if defined(PHP_WIN32) -PHP_FUNCTION(sapi_windows_cp_set); -PHP_FUNCTION(sapi_windows_cp_get); -PHP_FUNCTION(sapi_windows_cp_is_utf8); -PHP_FUNCTION(sapi_windows_cp_conv); -PHP_FUNCTION(sapi_windows_set_ctrl_handler); -PHP_FUNCTION(sapi_windows_generate_ctrl_event); -#endif - -PHP_FUNCTION(str_rot13); -PHP_FUNCTION(stream_get_filters); -PHP_FUNCTION(stream_filter_register); -PHP_FUNCTION(stream_bucket_make_writeable); -PHP_FUNCTION(stream_bucket_prepend); -PHP_FUNCTION(stream_bucket_append); -PHP_FUNCTION(stream_bucket_new); PHP_MINIT_FUNCTION(user_filters); PHP_RSHUTDOWN_FUNCTION(user_filters); PHP_RSHUTDOWN_FUNCTION(browscap); diff --git a/ext/standard/datetime.h b/ext/standard/datetime.h index afdabd4152..95ed0eab26 100644 --- a/ext/standard/datetime.h +++ b/ext/standard/datetime.h @@ -18,10 +18,6 @@ #ifndef DATETIME_H #define DATETIME_H -#if HAVE_STRPTIME -PHP_FUNCTION(strptime); -#endif - PHPAPI char *php_std_date(time_t t); #endif /* DATETIME_H */ diff --git a/ext/standard/exec.h b/ext/standard/exec.h index b92c6dce8e..97edbd099a 100644 --- a/ext/standard/exec.h +++ b/ext/standard/exec.h @@ -17,17 +17,6 @@ #ifndef EXEC_H #define EXEC_H -PHP_FUNCTION(system); -PHP_FUNCTION(exec); -PHP_FUNCTION(escapeshellcmd); -PHP_FUNCTION(escapeshellarg); -PHP_FUNCTION(passthru); -PHP_FUNCTION(shell_exec); -PHP_FUNCTION(proc_open); -PHP_FUNCTION(proc_get_status); -PHP_FUNCTION(proc_close); -PHP_FUNCTION(proc_terminate); -PHP_FUNCTION(proc_nice); PHP_MINIT_FUNCTION(proc_open); PHP_MINIT_FUNCTION(exec); diff --git a/ext/standard/file.h b/ext/standard/file.h index dbbaae0f39..28f906e0ba 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -22,46 +22,17 @@ PHP_MINIT_FUNCTION(file); PHP_MSHUTDOWN_FUNCTION(file); -PHP_FUNCTION(tempnam); -PHP_FUNCTION(tmpfile); -PHP_FUNCTION(fopen); PHPAPI PHP_FUNCTION(fclose); -PHP_FUNCTION(popen); -PHP_FUNCTION(pclose); PHPAPI PHP_FUNCTION(feof); PHPAPI PHP_FUNCTION(fread); PHPAPI PHP_FUNCTION(fgetc); PHPAPI PHP_FUNCTION(fgets); -PHP_FUNCTION(fscanf); -PHP_FUNCTION(fgetcsv); -PHP_FUNCTION(fputcsv); PHPAPI PHP_FUNCTION(fwrite); PHPAPI PHP_FUNCTION(fflush); PHPAPI PHP_FUNCTION(rewind); PHPAPI PHP_FUNCTION(ftell); PHPAPI PHP_FUNCTION(fseek); -PHP_FUNCTION(mkdir); -PHP_FUNCTION(rmdir); PHPAPI PHP_FUNCTION(fpassthru); -PHP_FUNCTION(readfile); -PHP_FUNCTION(umask); -PHP_FUNCTION(rename); -PHP_FUNCTION(unlink); -PHP_FUNCTION(copy); -PHP_FUNCTION(file); -PHP_FUNCTION(file_get_contents); -PHP_FUNCTION(file_put_contents); -PHP_FUNCTION(get_meta_tags); -PHP_FUNCTION(flock); -PHP_FUNCTION(fd_set); -PHP_FUNCTION(fd_isset); -PHP_FUNCTION(realpath); -#ifdef HAVE_FNMATCH -PHP_FUNCTION(fnmatch); -#endif -PHP_FUNCTION(ftruncate); -PHP_FUNCTION(fstat); -PHP_FUNCTION(sys_get_temp_dir); PHP_MINIT_FUNCTION(user_streams); diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h index 0547ee6073..40943aa0c4 100644 --- a/ext/standard/fsock.h +++ b/ext/standard/fsock.h @@ -23,7 +23,5 @@ #include "php_network.h" -PHP_FUNCTION(fsockopen); -PHP_FUNCTION(pfsockopen); #endif /* FSOCK_H */ diff --git a/ext/standard/head.h b/ext/standard/head.h index 4e1ae0b4c3..a972ebcf3d 100644 --- a/ext/standard/head.h +++ b/ext/standard/head.h @@ -26,13 +26,6 @@ #define COOKIE_SAMESITE "; SameSite=" extern PHP_RINIT_FUNCTION(head); -PHP_FUNCTION(header); -PHP_FUNCTION(header_remove); -PHP_FUNCTION(setcookie); -PHP_FUNCTION(setrawcookie); -PHP_FUNCTION(headers_sent); -PHP_FUNCTION(headers_list); -PHP_FUNCTION(http_response_code); PHPAPI int php_header(void); PHPAPI int php_setcookie(zend_string *name, zend_string *value, time_t expires, zend_string *path, zend_string *domain, int secure, int httponly, zend_string *samesite, int url_encode); diff --git a/ext/standard/hrtime.h b/ext/standard/hrtime.h index fa47e1c49f..29cc976709 100644 --- a/ext/standard/hrtime.h +++ b/ext/standard/hrtime.h @@ -51,8 +51,6 @@ PHPAPI php_hrtime_t php_hrtime_current(void); PHP_MINIT_FUNCTION(hrtime); -PHP_FUNCTION(hrtime); - END_EXTERN_C() #endif /* HRTIME_H */ diff --git a/ext/standard/html.h b/ext/standard/html.h index a43c0c823d..2a8d24ccde 100644 --- a/ext/standard/html.h +++ b/ext/standard/html.h @@ -44,12 +44,6 @@ void register_html_constants(INIT_FUNC_ARGS); -PHP_FUNCTION(htmlspecialchars); -PHP_FUNCTION(htmlentities); -PHP_FUNCTION(htmlspecialchars_decode); -PHP_FUNCTION(html_entity_decode); -PHP_FUNCTION(get_html_translation_table); - PHPAPI zend_string *php_escape_html_entities(unsigned char *old, size_t oldlen, int all, int flags, char *hint_charset); PHPAPI zend_string *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, int all, int flags, char *hint_charset, zend_bool double_encode); PHPAPI zend_string *php_unescape_html_entities(zend_string *str, int all, int flags, char *hint_charset); diff --git a/ext/standard/info.h b/ext/standard/info.h index b965448a44..95eec2d2ad 100644 --- a/ext/standard/info.h +++ b/ext/standard/info.h @@ -52,13 +52,6 @@ #define ZEND_LOGO_DATA_URI "data:image/png;base64,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" BEGIN_EXTERN_C() -PHP_FUNCTION(phpversion); -PHP_FUNCTION(phpinfo); -PHP_FUNCTION(phpcredits); -PHP_FUNCTION(php_sapi_name); -PHP_FUNCTION(php_uname); -PHP_FUNCTION(php_ini_scanned_files); -PHP_FUNCTION(php_ini_loaded_file); PHPAPI zend_string *php_info_html_esc(char *string); PHPAPI void php_info_html_esc_write(char *string, int str_len); PHPAPI void php_print_info_htmlhead(void); diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c index 2d4577b462..8b327c1929 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc.c @@ -29,7 +29,6 @@ */ #include "php.h" -#include "php_iptc.h" #include "ext/standard/head.h" #include diff --git a/ext/standard/link.c b/ext/standard/link.c index 3172b34d66..c6ef97247a 100644 --- a/ext/standard/link.c +++ b/ext/standard/link.c @@ -49,7 +49,6 @@ #include #include -#include "php_link.h" #include "php_string.h" #ifndef VOLUME_NAME_NT diff --git a/ext/standard/md5.h b/ext/standard/md5.h index 9463c13892..15417990d7 100644 --- a/ext/standard/md5.h +++ b/ext/standard/md5.h @@ -21,9 +21,6 @@ PHPAPI void make_digest(char *md5str, const unsigned char *digest); PHPAPI void make_digest_ex(char *md5str, const unsigned char *digest, int len); -PHP_FUNCTION(md5); -PHP_FUNCTION(md5_file); - #include "ext/standard/basic_functions.h" /* diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c index aa6fa0e798..970ec1391d 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -19,7 +19,6 @@ */ #include "php.h" -#include "php_metaphone.h" static int metaphone(unsigned char *word, size_t word_len, zend_long max_phonemes, zend_string **phoned_word, int traditional); diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c index 8f7ac8b1ec..b33face760 100644 --- a/ext/standard/microtime.c +++ b/ext/standard/microtime.c @@ -36,7 +36,6 @@ #include #include -#include "microtime.h" #include "ext/date/php_date.h" #define NUL '\0' diff --git a/ext/standard/microtime.h b/ext/standard/microtime.h deleted file mode 100644 index 949d10e50c..0000000000 --- a/ext/standard/microtime.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Paul Panotzki - Bunyip Information Systems | - +----------------------------------------------------------------------+ -*/ - -#ifndef MICROTIME_H -#define MICROTIME_H - -#ifdef HAVE_GETTIMEOFDAY -PHP_FUNCTION(microtime); -PHP_FUNCTION(gettimeofday); -#endif -#ifdef HAVE_GETRUSAGE -PHP_FUNCTION(getrusage); -#endif - -#endif /* MICROTIME_H */ diff --git a/ext/standard/pack.h b/ext/standard/pack.h index ed58b9fcec..e3a882e70e 100644 --- a/ext/standard/pack.h +++ b/ext/standard/pack.h @@ -18,7 +18,5 @@ #define PACK_H PHP_MINIT_FUNCTION(pack); -PHP_FUNCTION(pack); -PHP_FUNCTION(unpack); #endif /* PACK_H */ diff --git a/ext/standard/pageinfo.h b/ext/standard/pageinfo.h index 76543194dc..0a3fa7b28b 100644 --- a/ext/standard/pageinfo.h +++ b/ext/standard/pageinfo.h @@ -17,12 +17,6 @@ #ifndef PAGEINFO_H #define PAGEINFO_H -PHP_FUNCTION(getmyuid); -PHP_FUNCTION(getmygid); -PHP_FUNCTION(getmypid); -PHP_FUNCTION(getmyinode); -PHP_FUNCTION(getlastmod); - PHPAPI void php_statpage(void); PHPAPI time_t php_getlastmod(void); extern zend_long php_getuid(void); diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index ce440c454e..c513539dd2 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -23,84 +23,6 @@ PHP_MINIT_FUNCTION(array); PHP_MSHUTDOWN_FUNCTION(array); -PHP_FUNCTION(ksort); -PHP_FUNCTION(krsort); -PHP_FUNCTION(natsort); -PHP_FUNCTION(natcasesort); -PHP_FUNCTION(asort); -PHP_FUNCTION(arsort); -PHP_FUNCTION(sort); -PHP_FUNCTION(rsort); -PHP_FUNCTION(usort); -PHP_FUNCTION(uasort); -PHP_FUNCTION(uksort); -PHP_FUNCTION(array_walk); -PHP_FUNCTION(array_walk_recursive); -PHP_FUNCTION(count); -PHP_FUNCTION(end); -PHP_FUNCTION(prev); -PHP_FUNCTION(next); -PHP_FUNCTION(reset); -PHP_FUNCTION(current); -PHP_FUNCTION(key); -PHP_FUNCTION(min); -PHP_FUNCTION(max); -PHP_FUNCTION(in_array); -PHP_FUNCTION(array_search); -PHP_FUNCTION(extract); -PHP_FUNCTION(compact); -PHP_FUNCTION(array_fill); -PHP_FUNCTION(array_fill_keys); -PHP_FUNCTION(range); -PHP_FUNCTION(shuffle); -PHP_FUNCTION(array_multisort); -PHP_FUNCTION(array_push); -PHP_FUNCTION(array_pop); -PHP_FUNCTION(array_shift); -PHP_FUNCTION(array_unshift); -PHP_FUNCTION(array_splice); -PHP_FUNCTION(array_slice); -PHP_FUNCTION(array_merge); -PHP_FUNCTION(array_merge_recursive); -PHP_FUNCTION(array_replace); -PHP_FUNCTION(array_replace_recursive); -PHP_FUNCTION(array_keys); -PHP_FUNCTION(array_key_first); -PHP_FUNCTION(array_key_last); -PHP_FUNCTION(array_values); -PHP_FUNCTION(array_count_values); -PHP_FUNCTION(array_column); -PHP_FUNCTION(array_reverse); -PHP_FUNCTION(array_reduce); -PHP_FUNCTION(array_pad); -PHP_FUNCTION(array_flip); -PHP_FUNCTION(array_change_key_case); -PHP_FUNCTION(array_rand); -PHP_FUNCTION(array_unique); -PHP_FUNCTION(array_intersect); -PHP_FUNCTION(array_intersect_key); -PHP_FUNCTION(array_intersect_ukey); -PHP_FUNCTION(array_uintersect); -PHP_FUNCTION(array_intersect_assoc); -PHP_FUNCTION(array_uintersect_assoc); -PHP_FUNCTION(array_intersect_uassoc); -PHP_FUNCTION(array_uintersect_uassoc); -PHP_FUNCTION(array_diff); -PHP_FUNCTION(array_diff_key); -PHP_FUNCTION(array_diff_ukey); -PHP_FUNCTION(array_udiff); -PHP_FUNCTION(array_diff_assoc); -PHP_FUNCTION(array_udiff_assoc); -PHP_FUNCTION(array_diff_uassoc); -PHP_FUNCTION(array_udiff_uassoc); -PHP_FUNCTION(array_sum); -PHP_FUNCTION(array_product); -PHP_FUNCTION(array_filter); -PHP_FUNCTION(array_map); -PHP_FUNCTION(array_key_exists); -PHP_FUNCTION(array_chunk); -PHP_FUNCTION(array_combine); - PHPAPI int php_array_merge(HashTable *dest, HashTable *src); PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src); PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src); diff --git a/ext/standard/php_assert.h b/ext/standard/php_assert.h index 1289cc9b30..a0d81ed84e 100644 --- a/ext/standard/php_assert.h +++ b/ext/standard/php_assert.h @@ -22,7 +22,5 @@ PHP_MSHUTDOWN_FUNCTION(assert); PHP_RINIT_FUNCTION(assert); PHP_RSHUTDOWN_FUNCTION(assert); PHP_MINFO_FUNCTION(assert); -PHP_FUNCTION(assert); -PHP_FUNCTION(assert_options); #endif /* PHP_ASSERT_H */ diff --git a/ext/standard/php_browscap.h b/ext/standard/php_browscap.h index aa8eafb0a0..d19092afa8 100644 --- a/ext/standard/php_browscap.h +++ b/ext/standard/php_browscap.h @@ -20,6 +20,4 @@ PHP_MINIT_FUNCTION(browscap); PHP_MSHUTDOWN_FUNCTION(browscap); -PHP_FUNCTION(get_browser); - #endif /* PHP_BROWSCAP_H */ diff --git a/ext/standard/php_crypt.h b/ext/standard/php_crypt.h index d3ee90ee84..a7eabbdd66 100644 --- a/ext/standard/php_crypt.h +++ b/ext/standard/php_crypt.h @@ -20,7 +20,6 @@ #define PHP_CRYPT_H PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const char *salt, int salt_len, zend_bool quiet); -PHP_FUNCTION(crypt); PHP_MINIT_FUNCTION(crypt); PHP_MSHUTDOWN_FUNCTION(crypt); PHP_RINIT_FUNCTION(crypt); diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h index 599ac738c0..9343885d8e 100644 --- a/ext/standard/php_dir.h +++ b/ext/standard/php_dir.h @@ -20,18 +20,9 @@ /* directory functions */ PHP_MINIT_FUNCTION(dir); PHP_RINIT_FUNCTION(dir); -PHP_FUNCTION(opendir); PHP_FUNCTION(closedir); -PHP_FUNCTION(chdir); -#if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC -PHP_FUNCTION(chroot); -#endif -PHP_FUNCTION(getcwd); PHP_FUNCTION(rewinddir); PHP_FUNCTION(readdir); -PHP_FUNCTION(getdir); -PHP_FUNCTION(glob); -PHP_FUNCTION(scandir); #define PHP_SCANDIR_SORT_ASCENDING 0 #define PHP_SCANDIR_SORT_DESCENDING 1 diff --git a/ext/standard/php_dns.h b/ext/standard/php_dns.h index 3f4a61f6d5..b4f99f2a1c 100644 --- a/ext/standard/php_dns.h +++ b/ext/standard/php_dns.h @@ -53,23 +53,10 @@ #define HAVE_FULL_DNS_FUNCS 1 #endif -PHP_FUNCTION(gethostbyaddr); -PHP_FUNCTION(gethostbyname); -PHP_FUNCTION(gethostbynamel); - -#ifdef HAVE_GETHOSTNAME -PHP_FUNCTION(gethostname); -#endif - #if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC -PHP_FUNCTION(dns_check_record); - # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS -PHP_FUNCTION(dns_get_mx); -PHP_FUNCTION(dns_get_record); PHP_MINIT_FUNCTION(dns); # endif - #endif /* defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC */ #ifndef INT16SZ diff --git a/ext/standard/php_ext_syslog.h b/ext/standard/php_ext_syslog.h index 100f4b3ab5..d9daf43410 100644 --- a/ext/standard/php_ext_syslog.h +++ b/ext/standard/php_ext_syslog.h @@ -28,10 +28,6 @@ PHP_RSHUTDOWN_FUNCTION(syslog); #endif PHP_MSHUTDOWN_FUNCTION(syslog); -PHP_FUNCTION(openlog); -PHP_FUNCTION(syslog); -PHP_FUNCTION(closelog); - #endif #endif /* PHP_EXT_SYSLOG_H */ diff --git a/ext/standard/php_filestat.h b/ext/standard/php_filestat.h index 0e454ac208..13b79a4e07 100644 --- a/ext/standard/php_filestat.h +++ b/ext/standard/php_filestat.h @@ -20,42 +20,6 @@ PHP_RINIT_FUNCTION(filestat); PHP_RSHUTDOWN_FUNCTION(filestat); -PHP_FUNCTION(realpath_cache_size); -PHP_FUNCTION(realpath_cache_get); -PHP_FUNCTION(clearstatcache); -PHP_FUNCTION(fileatime); -PHP_FUNCTION(filectime); -PHP_FUNCTION(filegroup); -PHP_FUNCTION(fileinode); -PHP_FUNCTION(filemtime); -PHP_FUNCTION(fileowner); -PHP_FUNCTION(fileperms); -PHP_FUNCTION(filesize); -PHP_FUNCTION(filetype); -PHP_FUNCTION(is_writable); -PHP_FUNCTION(is_readable); -PHP_FUNCTION(is_executable); -PHP_FUNCTION(is_file); -PHP_FUNCTION(is_dir); -PHP_FUNCTION(is_link); -PHP_FUNCTION(file_exists); -PHP_FUNCTION(stat); -PHP_FUNCTION(lstat); -PHP_FUNCTION(disk_total_space); -PHP_FUNCTION(disk_free_space); -PHP_FUNCTION(chown); -PHP_FUNCTION(chgrp); -#if HAVE_LCHOWN -PHP_FUNCTION(lchown); -#endif -#if HAVE_LCHOWN -PHP_FUNCTION(lchgrp); -#endif -PHP_FUNCTION(chmod); -#if HAVE_UTIME -PHP_FUNCTION(touch); -#endif - #ifdef PHP_WIN32 #define S_IRUSR S_IREAD #define S_IWUSR S_IWRITE diff --git a/ext/standard/php_ftok.h b/ext/standard/php_ftok.h deleted file mode 100644 index 3726c36bd1..0000000000 --- a/ext/standard/php_ftok.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Andrew Sitnikov | - +----------------------------------------------------------------------+ -*/ - -#ifndef PHP_FTOK_H -#define PHP_FTOK_H - -#if HAVE_FTOK -PHP_FUNCTION(ftok); -#endif - -#endif /* PHP_FTOK_H */ diff --git a/ext/standard/php_http.h b/ext/standard/php_http.h index 5a0dba0818..728ea33fd1 100644 --- a/ext/standard/php_http.h +++ b/ext/standard/php_http.h @@ -27,6 +27,4 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, zval *type, char *arg_sep, int enc_type); #define php_url_encode_hash(ht, formstr) php_url_encode_hash_ex((ht), (formstr), NULL, 0, NULL, 0, NULL, 0, NULL) -PHP_FUNCTION(http_build_query); - #endif diff --git a/ext/standard/php_image.h b/ext/standard/php_image.h index 4bd972beac..d532496ea6 100644 --- a/ext/standard/php_image.h +++ b/ext/standard/php_image.h @@ -18,12 +18,6 @@ #ifndef PHP_IMAGE_H #define PHP_IMAGE_H -PHP_FUNCTION(getimagesize); -PHP_FUNCTION(getimagesizefromstring); - -PHP_FUNCTION(image_type_to_mime_type); -PHP_FUNCTION(image_type_to_extension); - /* {{{ enum image_filetype This enum is used to have ext/standard/image.c and ext/exif/exif.c use the same constants for file types. diff --git a/ext/standard/php_iptc.h b/ext/standard/php_iptc.h deleted file mode 100644 index 999912599a..0000000000 --- a/ext/standard/php_iptc.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Thies C. Arntzen | - +----------------------------------------------------------------------+ -*/ - -#ifndef PHP_IPTC_H -#define PHP_IPTC_H - -PHP_FUNCTION(iptcparse); -PHP_FUNCTION(iptcembed); - -#endif /* PHP_IPTC_H */ diff --git a/ext/standard/php_lcg.h b/ext/standard/php_lcg.h index 4feddb5c9b..c2aa7e8317 100644 --- a/ext/standard/php_lcg.h +++ b/ext/standard/php_lcg.h @@ -26,7 +26,6 @@ typedef struct { } php_lcg_globals; PHPAPI double php_combined_lcg(void); -PHP_FUNCTION(lcg_value); PHP_MINIT_FUNCTION(lcg); diff --git a/ext/standard/php_link.h b/ext/standard/php_link.h deleted file mode 100644 index fb7d76ba85..0000000000 --- a/ext/standard/php_link.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: | - +----------------------------------------------------------------------+ -*/ - -#ifndef PHP_LINK_H -#define PHP_LINK_H - -#if defined(HAVE_SYMLINK) || defined(PHP_WIN32) - -PHP_FUNCTION(link); -PHP_FUNCTION(readlink); -PHP_FUNCTION(linkinfo); -PHP_FUNCTION(symlink); - -#endif - -#endif /* PHP_LINK_H */ diff --git a/ext/standard/php_mail.h b/ext/standard/php_mail.h index 29fb5b77f4..3a2ccdc4b1 100644 --- a/ext/standard/php_mail.h +++ b/ext/standard/php_mail.h @@ -17,8 +17,6 @@ #ifndef PHP_MAIL_H #define PHP_MAIL_H -PHP_FUNCTION(mail); - PHP_MINFO_FUNCTION(mail); PHPAPI zend_string *php_mail_build_headers(HashTable *headers); diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index cdc524f4a2..a8d1f2dbf3 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -26,60 +26,6 @@ PHPAPI zend_long _php_math_basetolong(zval *arg, int base); PHPAPI void _php_math_basetozval(zend_string *str, int base, zval *ret); PHPAPI zend_string * _php_math_zvaltobase(zval *arg, int base); -PHP_FUNCTION(sin); -PHP_FUNCTION(cos); -PHP_FUNCTION(tan); -PHP_FUNCTION(asin); -PHP_FUNCTION(acos); -PHP_FUNCTION(atan); -PHP_FUNCTION(atan2); -PHP_FUNCTION(pi); -PHP_FUNCTION(exp); -PHP_FUNCTION(log); -PHP_FUNCTION(log10); -PHP_FUNCTION(is_finite); -PHP_FUNCTION(is_infinite); -PHP_FUNCTION(is_nan); -PHP_FUNCTION(pow); -PHP_FUNCTION(sqrt); -PHP_FUNCTION(rand); -PHP_FUNCTION(mt_srand); -PHP_FUNCTION(mt_rand); -PHP_FUNCTION(mt_getrandmax); -PHP_FUNCTION(abs); -PHP_FUNCTION(ceil); -PHP_FUNCTION(floor); -PHP_FUNCTION(round); -PHP_FUNCTION(decbin); -PHP_FUNCTION(dechex); -PHP_FUNCTION(decoct); -PHP_FUNCTION(bindec); -PHP_FUNCTION(hexdec); -PHP_FUNCTION(octdec); -PHP_FUNCTION(base_convert); -PHP_FUNCTION(number_format); -PHP_FUNCTION(fmod); -PHP_FUNCTION(fdiv); -PHP_FUNCTION(deg2rad); -PHP_FUNCTION(rad2deg); -PHP_FUNCTION(intdiv); - - /* - WARNING: these functions are experimental: they could change their names or - disappear in the next version of PHP! - */ -PHP_FUNCTION(hypot); -PHP_FUNCTION(expm1); -PHP_FUNCTION(log1p); - -PHP_FUNCTION(sinh); -PHP_FUNCTION(cosh); -PHP_FUNCTION(tanh); - -PHP_FUNCTION(asinh); -PHP_FUNCTION(acosh); -PHP_FUNCTION(atanh); - #include #ifndef M_E diff --git a/ext/standard/php_metaphone.h b/ext/standard/php_metaphone.h deleted file mode 100644 index c52bfe66a2..0000000000 --- a/ext/standard/php_metaphone.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Thies C. Arntzen | - +----------------------------------------------------------------------+ - */ - -#ifndef PHP_METAPHONE_H -#define PHP_METAPHONE_H - -PHP_FUNCTION(metaphone); - -#endif diff --git a/ext/standard/php_net.h b/ext/standard/php_net.h index 5eb65491aa..6f813d3e0a 100644 --- a/ext/standard/php_net.h +++ b/ext/standard/php_net.h @@ -22,6 +22,4 @@ PHPAPI zend_string* php_inet_ntop(const struct sockaddr *addr); -PHP_FUNCTION(net_get_interfaces); - #endif /* PHP_NET_H */ diff --git a/ext/standard/php_password.h b/ext/standard/php_password.h index d89f563f8f..5f9ae671ba 100644 --- a/ext/standard/php_password.h +++ b/ext/standard/php_password.h @@ -18,12 +18,6 @@ #ifndef PHP_PASSWORD_H #define PHP_PASSWORD_H -PHP_FUNCTION(password_hash); -PHP_FUNCTION(password_verify); -PHP_FUNCTION(password_needs_rehash); -PHP_FUNCTION(password_get_info); -PHP_FUNCTION(password_algos); - PHP_MINIT_FUNCTION(password); PHP_MSHUTDOWN_FUNCTION(password); diff --git a/ext/standard/php_random.h b/ext/standard/php_random.h index c45a3249b9..290b37873d 100644 --- a/ext/standard/php_random.h +++ b/ext/standard/php_random.h @@ -19,9 +19,6 @@ BEGIN_EXTERN_C() -PHP_FUNCTION(random_bytes); -PHP_FUNCTION(random_int); - PHP_MINIT_FUNCTION(random); PHP_MSHUTDOWN_FUNCTION(random); diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h index 21926d316f..bf89880dff 100644 --- a/ext/standard/php_standard.h +++ b/ext/standard/php_standard.h @@ -32,28 +32,21 @@ #include "php_browscap.h" #include "pack.h" #include "datetime.h" -#include "microtime.h" #include "url.h" #include "pageinfo.h" -#include "php_link.h" #include "fsock.h" #include "php_image.h" -#include "php_iptc.h" #include "info.h" -#include "uniqid.h" #include "php_var.h" #include "quot_print.h" #include "dl.h" #include "php_crypt.h" #include "head.h" #include "php_lcg.h" -#include "php_metaphone.h" #include "php_output.h" #include "php_array.h" #include "php_assert.h" #include "php_versioning.h" -#include "php_ftok.h" -#include "php_type.h" #include "php_password.h" #include "php_random.h" diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 7492902c99..7a813c2610 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -18,79 +18,6 @@ #ifndef PHP_STRING_H #define PHP_STRING_H -PHP_FUNCTION(strspn); -PHP_FUNCTION(strcspn); -PHP_FUNCTION(str_replace); -PHP_FUNCTION(str_ireplace); -PHP_FUNCTION(rtrim); -PHP_FUNCTION(trim); -PHP_FUNCTION(ltrim); -PHP_FUNCTION(soundex); -PHP_FUNCTION(levenshtein); - -PHP_FUNCTION(count_chars); -PHP_FUNCTION(wordwrap); -PHP_FUNCTION(explode); -PHP_FUNCTION(implode); -PHP_FUNCTION(strtok); -PHP_FUNCTION(strtoupper); -PHP_FUNCTION(strtolower); -PHP_FUNCTION(basename); -PHP_FUNCTION(dirname); -PHP_FUNCTION(pathinfo); -PHP_FUNCTION(strstr); -PHP_FUNCTION(str_contains); -PHP_FUNCTION(strpos); -PHP_FUNCTION(stripos); -PHP_FUNCTION(strrpos); -PHP_FUNCTION(strripos); -PHP_FUNCTION(strrchr); -PHP_FUNCTION(substr); -PHP_FUNCTION(quotemeta); -PHP_FUNCTION(ucfirst); -PHP_FUNCTION(lcfirst); -PHP_FUNCTION(ucwords); -PHP_FUNCTION(strtr); -PHP_FUNCTION(strrev); -PHP_FUNCTION(hebrev); -PHP_FUNCTION(sprintf); -PHP_FUNCTION(printf); -PHP_FUNCTION(vprintf); -PHP_FUNCTION(vsprintf); -PHP_FUNCTION(addcslashes); -PHP_FUNCTION(addslashes); -PHP_FUNCTION(stripcslashes); -PHP_FUNCTION(stripslashes); -PHP_FUNCTION(chr); -PHP_FUNCTION(ord); -PHP_FUNCTION(nl2br); -PHP_FUNCTION(setlocale); -PHP_FUNCTION(localeconv); -PHP_FUNCTION(nl_langinfo); -PHP_FUNCTION(stristr); -PHP_FUNCTION(chunk_split); -PHP_FUNCTION(parse_str); -PHP_FUNCTION(str_getcsv); -PHP_FUNCTION(bin2hex); -PHP_FUNCTION(hex2bin); -PHP_FUNCTION(similar_text); -PHP_FUNCTION(strip_tags); -PHP_FUNCTION(str_repeat); -PHP_FUNCTION(substr_replace); -PHP_FUNCTION(strnatcmp); -PHP_FUNCTION(strnatcasecmp); -PHP_FUNCTION(substr_count); -PHP_FUNCTION(str_pad); -PHP_FUNCTION(sscanf); -PHP_FUNCTION(str_shuffle); -PHP_FUNCTION(str_word_count); -PHP_FUNCTION(str_split); -PHP_FUNCTION(strpbrk); -PHP_FUNCTION(substr_compare); -PHP_FUNCTION(utf8_encode); -PHP_FUNCTION(utf8_decode); -PHP_FUNCTION(strcoll); - #if defined(ZTS) PHP_MINIT_FUNCTION(localeconv); PHP_MSHUTDOWN_FUNCTION(localeconv); diff --git a/ext/standard/php_type.h b/ext/standard/php_type.h deleted file mode 100644 index be056201db..0000000000 --- a/ext/standard/php_type.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Rasmus Lerdorf | - +----------------------------------------------------------------------+ -*/ - -#ifndef PHP_TYPE_H -#define PHP_TYPE_H - -PHP_FUNCTION(intval); -PHP_FUNCTION(floatval); -PHP_FUNCTION(strval); -PHP_FUNCTION(boolval); -PHP_FUNCTION(gettype); -PHP_FUNCTION(settype); -PHP_FUNCTION(is_null); -PHP_FUNCTION(is_resource); -PHP_FUNCTION(is_bool); -PHP_FUNCTION(is_int); -PHP_FUNCTION(is_float); -PHP_FUNCTION(is_numeric); -PHP_FUNCTION(is_string); -PHP_FUNCTION(is_array); -PHP_FUNCTION(is_object); -PHP_FUNCTION(is_scalar); -PHP_FUNCTION(is_callable); -PHP_FUNCTION(is_iterable); -PHP_FUNCTION(is_countable); - -#endif diff --git a/ext/standard/php_uuencode.h b/ext/standard/php_uuencode.h index 40a1a20b21..82549f56d1 100644 --- a/ext/standard/php_uuencode.h +++ b/ext/standard/php_uuencode.h @@ -17,9 +17,6 @@ #ifndef PHP_UUENCODE_H #define PHP_UUENCODE_H -PHP_FUNCTION(convert_uudecode); -PHP_FUNCTION(convert_uuencode); - PHPAPI zend_string *php_uudecode(char *src, size_t src_len); PHPAPI zend_string *php_uuencode(char *src, size_t src_len); diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index d9abae86d2..cab0f6d4dd 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -21,13 +21,6 @@ #include "zend_smart_str_public.h" PHP_MINIT_FUNCTION(var); -PHP_FUNCTION(var_dump); -PHP_FUNCTION(var_export); -PHP_FUNCTION(debug_zval_dump); -PHP_FUNCTION(serialize); -PHP_FUNCTION(unserialize); -PHP_FUNCTION(memory_get_usage); -PHP_FUNCTION(memory_get_peak_usage); PHPAPI void php_var_dump(zval *struc, int level); PHPAPI void php_var_export(zval *struc, int level); diff --git a/ext/standard/php_versioning.h b/ext/standard/php_versioning.h index 1c5041e0dc..c930d7ef25 100644 --- a/ext/standard/php_versioning.h +++ b/ext/standard/php_versioning.h @@ -21,6 +21,5 @@ PHPAPI char *php_canonicalize_version(const char *); PHPAPI int php_version_compare(const char *, const char *); -PHP_FUNCTION(version_compare); #endif diff --git a/ext/standard/quot_print.h b/ext/standard/quot_print.h index d27f6f1d2d..e30ca990e1 100644 --- a/ext/standard/quot_print.h +++ b/ext/standard/quot_print.h @@ -20,7 +20,4 @@ PHPAPI zend_string *php_quot_print_decode(const unsigned char *str, size_t length, int replace_us_by_ws); PHPAPI zend_string *php_quot_print_encode(const unsigned char *str, size_t length); -PHP_FUNCTION(quoted_printable_decode); -PHP_FUNCTION(quoted_printable_encode); - #endif /* QUOT_PRINT_H */ diff --git a/ext/standard/sha1.h b/ext/standard/sha1.h index b1788a6739..81a9cae460 100644 --- a/ext/standard/sha1.h +++ b/ext/standard/sha1.h @@ -31,7 +31,4 @@ PHPAPI void PHP_SHA1Update(PHP_SHA1_CTX *, const unsigned char *, size_t); PHPAPI void PHP_SHA1Final(unsigned char[20], PHP_SHA1_CTX *); PHPAPI void make_sha1_digest(char *sha1str, unsigned char *digest); -PHP_FUNCTION(sha1); -PHP_FUNCTION(sha1_file); - #endif diff --git a/ext/standard/streamsfuncs.h b/ext/standard/streamsfuncs.h index 6a94169dc6..7210ee06a3 100644 --- a/ext/standard/streamsfuncs.h +++ b/ext/standard/streamsfuncs.h @@ -18,50 +18,3 @@ #define PHP_STREAM_CLIENT_PERSISTENT 1 #define PHP_STREAM_CLIENT_ASYNC_CONNECT 2 #define PHP_STREAM_CLIENT_CONNECT 4 - -PHP_FUNCTION(stream_socket_client); -PHP_FUNCTION(stream_socket_server); -PHP_FUNCTION(stream_socket_accept); -PHP_FUNCTION(stream_socket_get_name); -PHP_FUNCTION(stream_socket_recvfrom); -PHP_FUNCTION(stream_socket_sendto); - -PHP_FUNCTION(stream_copy_to_stream); -PHP_FUNCTION(stream_get_contents); - -PHP_FUNCTION(stream_set_blocking); -PHP_FUNCTION(stream_select); -PHP_FUNCTION(stream_set_timeout); -PHP_FUNCTION(stream_set_read_buffer); -PHP_FUNCTION(stream_set_write_buffer); -PHP_FUNCTION(stream_set_chunk_size); -PHP_FUNCTION(stream_get_transports); -PHP_FUNCTION(stream_get_wrappers); -PHP_FUNCTION(stream_get_line); -PHP_FUNCTION(stream_get_meta_data); -PHP_FUNCTION(stream_wrapper_register); -PHP_FUNCTION(stream_wrapper_unregister); -PHP_FUNCTION(stream_wrapper_restore); -PHP_FUNCTION(stream_context_create); -PHP_FUNCTION(stream_context_set_params); -PHP_FUNCTION(stream_context_get_params); -PHP_FUNCTION(stream_context_set_option); -PHP_FUNCTION(stream_context_get_options); -PHP_FUNCTION(stream_context_get_default); -PHP_FUNCTION(stream_context_set_default); -PHP_FUNCTION(stream_filter_prepend); -PHP_FUNCTION(stream_filter_append); -PHP_FUNCTION(stream_filter_remove); -PHP_FUNCTION(stream_socket_enable_crypto); -PHP_FUNCTION(stream_socket_shutdown); -PHP_FUNCTION(stream_resolve_include_path); -PHP_FUNCTION(stream_is_local); -PHP_FUNCTION(stream_supports_lock); -PHP_FUNCTION(stream_isatty); -#ifdef PHP_WIN32 -PHP_FUNCTION(sapi_windows_vt100_support); -#endif - -#if HAVE_SOCKETPAIR -PHP_FUNCTION(stream_socket_pair); -#endif diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c index 08a315edbe..94684427bb 100644 --- a/ext/standard/uniqid.c +++ b/ext/standard/uniqid.c @@ -32,7 +32,6 @@ #endif #include "php_lcg.h" -#include "uniqid.h" #ifdef HAVE_GETTIMEOFDAY ZEND_TLS struct timeval prev_tv = { 0, 0 }; diff --git a/ext/standard/uniqid.h b/ext/standard/uniqid.h deleted file mode 100644 index ed1472ff06..0000000000 --- a/ext/standard/uniqid.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Stig Sæther Bakken | - +----------------------------------------------------------------------+ - */ - -#ifndef UNIQID_H -#define UNIQID_H - -#ifdef HAVE_GETTIMEOFDAY -PHP_FUNCTION(uniqid); -#endif - -#endif /* UNIQID_H */ diff --git a/ext/standard/url.h b/ext/standard/url.h index d242518a08..02ebeed2bb 100644 --- a/ext/standard/url.h +++ b/ext/standard/url.h @@ -37,13 +37,6 @@ PHPAPI zend_string *php_url_encode(char const *s, size_t len); PHPAPI zend_string *php_raw_url_encode(char const *s, size_t len); PHPAPI char *php_replace_controlchars_ex(char *str, size_t len); -PHP_FUNCTION(parse_url); -PHP_FUNCTION(urlencode); -PHP_FUNCTION(urldecode); -PHP_FUNCTION(rawurlencode); -PHP_FUNCTION(rawurldecode); -PHP_FUNCTION(get_headers); - #define PHP_URL_SCHEME 0 #define PHP_URL_HOST 1 #define PHP_URL_PORT 2