archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFH: nuke php3 legacy

Browse source
This commit is contained in:
foobar 2005-12-06 02:28:41 +00:00
parent 347032c753
commit 3e669bc950
86 changed files with 119 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/bcmath/bcmath.c
View file

@ -33,7 +33,7 @@
ZEND_DECLARE_MODULE_GLOBALS(bcmath);
function_entry bcmath_functions[] = {
zend_function_entry bcmath_functions[] = {
PHP_FE(bcadd, NULL)
PHP_FE(bcsub, NULL)
PHP_FE(bcmul, NULL)

2
ext/bz2/bz2.c
View file

@ -40,7 +40,7 @@
#define PHP_BZ_ERRSTR 1
#define PHP_BZ_ERRBOTH 2
function_entry bz2_functions[] = {
zend_function_entry bz2_functions[] = {
PHP_FE(bzopen, NULL)
PHP_FE(bzread, NULL)
PHP_FALIAS(bzwrite, fwrite, NULL)

4
ext/calendar/cal_unix.c
View file

@ -28,7 +28,7 @@
Convert UNIX timestamp to Julian Day */
PHP_FUNCTION(unixtojd)
{
pval *timestamp;
zval *timestamp;
long jdate;
time_t t;
struct tm *ta, tmbuf;
@ -60,7 +60,7 @@ PHP_FUNCTION(unixtojd)
Convert Julian Day to UNIX timestamp */
PHP_FUNCTION(jdtounix)
{
pval *jday;
zval *jday;
long uday;
if ((ZEND_NUM_ARGS()!= 1) || (zend_get_parameters(ht, 1, &jday) != SUCCESS)) {

2
ext/calendar/calendar.c
View file

@ -35,7 +35,7 @@
#include <stdio.h>
function_entry calendar_functions[] = {
zend_function_entry calendar_functions[] = {
PHP_FE(jdtogregorian, NULL)
PHP_FE(gregoriantojd, NULL)
PHP_FE(jdtojulian, NULL)

2
ext/com_dotnet/com_extension.c
View file

@ -37,7 +37,7 @@ zend_class_entry
*php_com_exception_class_entry,
*php_com_saproxy_class_entry;
function_entry com_dotnet_functions[] = {
zend_function_entry com_dotnet_functions[] = {
PHP_FE(variant_set, NULL)
PHP_FE(variant_add, NULL)
PHP_FE(variant_cat, NULL)

2
ext/ctype/ctype.c
View file

@ -43,7 +43,7 @@ ZEND_DECLARE_MODULE_GLOBALS(ctype)
/* {{{ ctype_functions[]
* Every user visible function must have an entry in ctype_functions[].
*/
function_entry ctype_functions[] = {
zend_function_entry ctype_functions[] = {
PHP_FE(ctype_alnum, NULL)
PHP_FE(ctype_alpha, NULL)
PHP_FE(ctype_cntrl, NULL)

2
ext/curl/interface.c
View file

@ -130,7 +130,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
/* {{{ curl_functions[]
*/
function_entry curl_functions[] = {
zend_function_entry curl_functions[] = {
PHP_FE(curl_init, NULL)
PHP_FE(curl_copy_handle, NULL)
PHP_FE(curl_version, NULL)

2
ext/dba/dba.c
View file

@ -53,7 +53,7 @@
/* {{{ dba_functions[]
*/
function_entry dba_functions[] = {
zend_function_entry dba_functions[] = {
PHP_FE(dba_open, NULL)
PHP_FE(dba_popen, NULL)
PHP_FE(dba_close, NULL)

2
ext/dbase/dbase.c
View file

@ -730,7 +730,7 @@ PHP_FUNCTION(dbase_create)
/* {{{ dbase_functions[]
*/
function_entry dbase_functions[] = {
zend_function_entry dbase_functions[] = {
PHP_FE(dbase_open, NULL)
PHP_FE(dbase_create, NULL)
PHP_FE(dbase_close, NULL)

4
ext/dom/dom_iterators.c
View file

@ -189,7 +189,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC)
dom_nnodemap_object *objmap;
int ret, previndex=1;
HashTable *nodeht;
pval **entry;
zval **entry;
php_dom_iterator *iterator = (php_dom_iterator *)iter;
@ -258,7 +258,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object TS
zval *curattr = NULL;
int ret, curindex = 0;
HashTable *nodeht;
pval **entry;
zval **entry;
php_dom_iterator *iterator = emalloc(sizeof(php_dom_iterator));

2
ext/dom/nodelist.c
View file

@ -109,7 +109,7 @@ PHP_FUNCTION(dom_nodelist_item)
xmlNodePtr nodep, curnode;
int count = 0;
HashTable *nodeht;
pval **entry;
zval **entry;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) {
return;

10
ext/exif/exif.c
View file

@ -105,7 +105,7 @@ ZEND_END_ARG_INFO();
/* {{{ exif_functions[]
*/
function_entry exif_functions[] = {
zend_function_entry exif_functions[] = {
PHP_FE(exif_read_data, NULL)
PHP_FALIAS(read_exif_data, exif_read_data, NULL)
PHP_FE(exif_tagname, NULL)
@ -1843,7 +1843,7 @@ static void exif_iif_free(image_info_type *image_info, int section_index) {
/* {{{ add_assoc_image_info
* Add image_info to associative array value. */
static void add_assoc_image_info(pval *value, int sub_array, image_info_type *image_info, int section_index TSRMLS_DC)
static void add_assoc_image_info(zval *value, int sub_array, image_info_type *image_info, int section_index TSRMLS_DC)
{
char buffer[64], *val, *name, uname[64];
int i, ap, l, b, idx=0, unknown=0;
@ -1852,7 +1852,7 @@ static void add_assoc_image_info(pval *value, int sub_array, image_info_type *im
#endif
image_info_value *info_value;
image_info_data *info_data;
pval *tmpi, *array = NULL;
zval *tmpi, *array = NULL;
#ifdef EXIF_DEBUG
/* php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Adding %d infos from section %s", image_info->info_list[section_index].count, exif_get_sectionname(section_index));*/
@ -2248,7 +2248,7 @@ static char * exif_get_markername(int marker)
Get headername for index or false if not defined */
PHP_FUNCTION(exif_tagname)
{
pval **p_num;
zval **p_num;
int tag, ac = ZEND_NUM_ARGS();
char *szTemp;
@ -3780,7 +3780,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
Reads header data from the JPEG/TIFF image filename and optionally reads the internal thumbnails */
PHP_FUNCTION(exif_read_data)
{
pval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all;
zval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all;
int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0, sub_arrays=0, read_thumbnail=0, read_all=0;
image_info_type ImageInfo;
char tmp[64], *sections_str, *s;

2
ext/fbsql/php_fbsql.c
View file

@ -183,7 +183,7 @@ char *DigestPassword(char *user, char *password)
/* {{{ fbsql_functions[]
*/
function_entry fbsql_functions[] = {
zend_function_entry fbsql_functions[] = {
PHP_FE(fbsql_connect, NULL)
PHP_FE(fbsql_pconnect, NULL)
PHP_FE(fbsql_close, NULL)

2
ext/fdf/fdf.c
View file

@ -49,7 +49,7 @@ SAPI_POST_HANDLER_FUNC(fdf_post_handler);
/* {{{ fdf_functions[]
*/
function_entry fdf_functions[] = {
zend_function_entry fdf_functions[] = {
PHP_FE(fdf_add_template, NULL)
PHP_FE(fdf_close, NULL)
PHP_FE(fdf_create, NULL)

2
ext/filepro/filepro.c
View file

@ -162,7 +162,7 @@ PHP_MSHUTDOWN_FUNCTION(filepro)
}
/* }}} */
function_entry filepro_functions[] = {
zend_function_entry filepro_functions[] = {
PHP_FE(filepro, NULL)
PHP_FE(filepro_rowcount, NULL)
PHP_FE(filepro_fieldname, NULL)

4
ext/ftp/php_ftp.c
View file

@ -51,7 +51,7 @@ static
ZEND_ARG_PASS_INFO(1)
ZEND_END_ARG_INFO()
function_entry php_ftp_functions[] = {
zend_function_entry php_ftp_functions[] = {
PHP_FE(ftp_connect, NULL)
#if HAVE_OPENSSL_EXT
PHP_FE(ftp_ssl_connect, NULL)
@ -316,7 +316,7 @@ PHP_FUNCTION(ftp_chdir)
Requests execution of a program on the FTP server */
PHP_FUNCTION(ftp_exec)
{
pval *z_ftp;
zval *z_ftp;
ftpbuf_t *ftp;
char *cmd;
int cmd_len;

2
ext/gd/gd.c
View file

@ -163,7 +163,7 @@ static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold
/* {{{ gd_functions[]
*/
function_entry gd_functions[] = {
zend_function_entry gd_functions[] = {
PHP_FE(gd_info, NULL)
PHP_FE(imagearc, NULL)
PHP_FE(imageellipse, NULL)

2
ext/gettext/gettext.c
View file

@ -32,7 +32,7 @@
/* {{{ php_gettext_functions[]
*/
function_entry php_gettext_functions[] = {
zend_function_entry php_gettext_functions[] = {
PHP_NAMED_FE(textdomain, zif_textdomain, NULL)
PHP_NAMED_FE(gettext, zif_gettext, NULL)
/* Alias for gettext() */

2
ext/gmp/gmp.c
View file

@ -39,7 +39,7 @@ static int le_gmp;
/* {{{ gmp_functions[]
*/
function_entry gmp_functions[] = {
zend_function_entry gmp_functions[] = {
ZEND_FE(gmp_init, NULL)
ZEND_FE(gmp_intval, NULL)
ZEND_FE(gmp_strval, NULL)

2
ext/hash/hash.c
View file

@ -596,7 +596,7 @@ PHP_MINFO_FUNCTION(hash)
/* {{{ hash_functions[]
*/
function_entry hash_functions[] = {
zend_function_entry hash_functions[] = {
PHP_FE(hash, NULL)
PHP_FE(hash_file, NULL)

14
ext/hwapi/hwapi.cpp
View file

@ -67,7 +67,7 @@ static zend_class_entry *hw_api_reason_class_entry_ptr;
//}
//#endif
function_entry hwapi_functions[] = {
zend_function_entry hwapi_functions[] = {
PHP_FE(hwapi_dummy, NULL)
PHP_FE(hwapi_init, NULL)
PHP_FE(hwapi_hgcsp, NULL)
@ -102,7 +102,7 @@ function_entry hwapi_functions[] = {
{NULL, NULL, NULL}
};
static function_entry php_hw_api_functions[] = {
static zend_function_entry php_hw_api_functions[] = {
{"hgcsp", PHP_FN(hwapi_hgcsp), NULL},
{"object", PHP_FN(hwapi_object), NULL},
{"children", PHP_FN(hwapi_children), NULL},
@ -148,7 +148,7 @@ static function_entry php_hw_api_functions[] = {
{NULL, NULL, NULL}
};
static function_entry php_hw_api_object_functions[] = {
static zend_function_entry php_hw_api_object_functions[] = {
{"hw_api_object", PHP_FN(hwapi_object_new), NULL},
{"count", PHP_FN(hwapi_object_count), NULL},
{"title", PHP_FN(hwapi_object_title), NULL},
@ -161,7 +161,7 @@ static function_entry php_hw_api_object_functions[] = {
{NULL, NULL, NULL}
};
static function_entry php_hw_api_attribute_functions[] = {
static zend_function_entry php_hw_api_attribute_functions[] = {
{"hw_api_attribute", PHP_FN(hwapi_attribute_new), NULL},
{"key", PHP_FN(hwapi_attribute_key), NULL},
{"value", PHP_FN(hwapi_attribute_value), NULL},
@ -170,20 +170,20 @@ static function_entry php_hw_api_attribute_functions[] = {
{NULL, NULL, NULL}
};
static function_entry php_hw_api_error_functions[] = {
static zend_function_entry php_hw_api_error_functions[] = {
{"count", PHP_FN(hwapi_error_count), NULL},
{"reason", PHP_FN(hwapi_error_reason), NULL},
{NULL, NULL, NULL}
};
static function_entry php_hw_api_content_functions[] = {
static zend_function_entry php_hw_api_content_functions[] = {
{"hw_api_content", PHP_FN(hwapi_content_new), NULL},
{"read", PHP_FN(hwapi_content_read), NULL},
{"mimetype", PHP_FN(hwapi_content_mimetype), NULL},
{NULL, NULL, NULL}
};
static function_entry php_hw_api_reason_functions[] = {
static zend_function_entry php_hw_api_reason_functions[] = {
{"type", PHP_FN(hwapi_reason_type), NULL},
{"description", PHP_FN(hwapi_reason_description), NULL},
{NULL, NULL, NULL}

2
ext/iconv/iconv.c
View file

@ -64,7 +64,7 @@
/* {{{ iconv_functions[]
*/
function_entry iconv_functions[] = {
zend_function_entry iconv_functions[] = {
PHP_NAMED_FE(iconv,php_if_iconv, NULL)
PHP_FE(ob_iconv_handler, NULL)
PHP_FE(iconv_get_encoding, NULL)

2
ext/imap/php_imap.c
View file

@ -79,7 +79,7 @@ void *fs_get(size_t size);
/* {{{ imap_functions[]
*/
function_entry imap_functions[] = {
zend_function_entry imap_functions[] = {
PHP_FE(imap_open, NULL)
PHP_FE(imap_reopen, NULL)
PHP_FE(imap_close, NULL)

2
ext/informix/ifx.ec
View file

@ -140,7 +140,7 @@ typedef char IFX[128];
} \
} while (0)
function_entry ifx_functions[] = {
zend_function_entry ifx_functions[] = {
PHP_FE(ifx_connect, NULL)
PHP_FE(ifx_pconnect, NULL)
PHP_FE(ifx_close, NULL)

4
ext/interbase/interbase.c
View file

@ -36,7 +36,7 @@
#include "php_interbase.h"
#include "php_ibase_includes.h"
#include "SAPI.h"
5B
#include <time.h>
#define ROLLBACK 0
@ -44,7 +44,7 @@
#define RETAIN 2
/* {{{ extension definition structures */
function_entry ibase_functions[] = {
zend_function_entry ibase_functions[] = {
PHP_FE(ibase_connect, NULL)
PHP_FE(ibase_pconnect, NULL)
PHP_FE(ibase_close, NULL)

2
ext/ldap/ldap.c
View file

@ -97,7 +97,7 @@ static int le_link, le_result, le_result_entry, le_ber_entry;
*/
/* {{{ ldap_functions[]
*/
function_entry ldap_functions[] = {
zend_function_entry ldap_functions[] = {
PHP_FE(ldap_connect, NULL)
PHP_FALIAS(ldap_close, ldap_unbind, NULL)
PHP_FE(ldap_bind, NULL)

2
ext/libxml/libxml.c
View file

@ -87,7 +87,7 @@ PHP_MINFO_FUNCTION(libxml);
/* }}} */
/* {{{ extension definition structures */
function_entry libxml_functions[] = {
zend_function_entry libxml_functions[] = {
PHP_FE(libxml_set_streams_context, NULL)
PHP_FE(libxml_use_internal_errors, NULL)
PHP_FE(libxml_get_last_error, NULL)

2
ext/mcrypt/mcrypt.c
View file

@ -43,7 +43,7 @@ typedef struct _php_mcrypt {
zend_bool init;
} php_mcrypt;
function_entry mcrypt_functions[] = {
zend_function_entry mcrypt_functions[] = {
PHP_FE(mcrypt_ecb, NULL)
PHP_FE(mcrypt_cbc, NULL)
PHP_FE(mcrypt_cfb, NULL)

2
ext/mhash/mhash.c
View file

@ -33,7 +33,7 @@
#include "php_globals.h"
#include "ext/standard/info.h"
function_entry mhash_functions[] = {
zend_function_entry mhash_functions[] = {
PHP_FE(mhash_get_block_size, NULL)
PHP_FE(mhash_get_hash_name, NULL)
PHP_FE(mhash_keygen_s2k, NULL)

2
ext/mime_magic/mime_magic.c
View file

@ -218,7 +218,7 @@ ZEND_DECLARE_MODULE_GLOBALS(mime_magic)
static magic_server_config_rec mime_global;
/* {{{ mime_magic_functions[] */
function_entry mime_magic_functions[] = {
zend_function_entry mime_magic_functions[] = {
PHP_FE(mime_content_type, NULL)
{NULL, NULL, NULL}
};

2
ext/msession/msession.c
View file

@ -120,7 +120,7 @@ static int s_port=8086;
static void * s_conn=NULL;
static REQB * s_reqb=NULL;
function_entry msession_functions[] = {
zend_function_entry msession_functions[] = {
PHP_FE(msession_connect,NULL)
PHP_FE(msession_disconnect,NULL)
PHP_FE(msession_lock,NULL)

2
ext/msql/php_msql.c
View file

@ -46,7 +46,7 @@ static php_msql_globals msql_globals;
/* {{{ msql_functions[]
*/
function_entry msql_functions[] = {
zend_function_entry msql_functions[] = {
PHP_FE(msql_connect, NULL)
PHP_FE(msql_pconnect, NULL)
PHP_FE(msql_close, NULL)

2
ext/mysql/php_mysql.c
View file

@ -123,7 +123,7 @@ typedef struct _php_mysql_conn {
/* {{{ mysql_functions[]
*/
function_entry mysql_functions[] = {
zend_function_entry mysql_functions[] = {
PHP_FE(mysql_connect, NULL)
PHP_FE(mysql_pconnect, NULL)
PHP_FE(mysql_close, NULL)

2
ext/ncurses/ncurses_fe.c
View file

@ -50,7 +50,7 @@ static
*
* Every user visible function must have an entry in ncurses_functions[].
*/
function_entry ncurses_functions[] = {
zend_function_entry ncurses_functions[] = {
PHP_FE(ncurses_addch, NULL)
#ifdef HAVE_NCURSES_COLOR_SET
PHP_FE(ncurses_color_set, NULL)

2
ext/ncurses/php_ncurses.h
View file

@ -36,7 +36,7 @@ extern int le_ncurses_panels;
extern zend_module_entry ncurses_module_entry;
#define phpext_ncurses_ptr &ncurses_module_entry
extern function_entry ncurses_functions[];
extern zend_function_entry ncurses_functions[];
#include "php_ncurses_fe.h"
#ifdef PHP_WIN32

2
ext/odbc/birdstep.c
View file

@ -48,7 +48,7 @@
#include "php_birdstep.h"
#include "ext/standard/info.h"
function_entry birdstep_functions[] = {
zend_function_entry birdstep_functions[] = {
PHP_FE(birdstep_connect, NULL)
PHP_FE(birdstep_close, NULL)
PHP_FE(birdstep_exec, NULL)

2
ext/openssl/openssl.c
View file

@ -79,7 +79,7 @@ enum php_openssl_cipher_type {
/* {{{ openssl_functions[]
*/
function_entry openssl_functions[] = {
zend_function_entry openssl_functions[] = {
/* public/private key functions */
PHP_FE(openssl_pkey_free, NULL)
PHP_FE(openssl_pkey_new, NULL)

2
ext/pcntl/pcntl.c
View file

@ -43,7 +43,7 @@
ZEND_DECLARE_MODULE_GLOBALS(pcntl)
function_entry pcntl_functions[] = {
zend_function_entry pcntl_functions[] = {
PHP_FE(pcntl_fork, NULL)
PHP_FE(pcntl_waitpid, second_arg_force_ref)
PHP_FE(pcntl_wait, first_arg_force_ref)

2
ext/pcre/php_pcre.c
View file

@ -1610,7 +1610,7 @@ PHP_FUNCTION(preg_grep)
/* {{{ module definition structures */
function_entry pcre_functions[] = {
zend_function_entry pcre_functions[] = {
PHP_FE(preg_match, third_arg_force_ref)
PHP_FE(preg_match_all, third_arg_force_ref)
PHP_FE(preg_replace, NULL)

2
ext/pdo/pdo.c
View file

@ -101,7 +101,7 @@ PHP_FUNCTION(pdo_drivers)
/* }}} */
/* {{{ pdo_functions[] */
function_entry pdo_functions[] = {
zend_function_entry pdo_functions[] = {
PHP_FE(pdo_drivers, NULL)
{NULL, NULL, NULL}
};

4
ext/pdo/pdo_dbh.c
View file

@ -1083,7 +1083,7 @@ static PHP_METHOD(PDO, getAvailableDrivers)
}
/* }}} */
function_entry pdo_dbh_functions[] = {
zend_function_entry pdo_dbh_functions[] = {
ZEND_MALIAS(PDO, __construct, dbh_constructor, NULL, ZEND_ACC_PUBLIC)
PHP_ME(PDO, prepare, NULL, ZEND_ACC_PUBLIC)
PHP_ME(PDO, beginTransaction,NULL, ZEND_ACC_PUBLIC)
@ -1106,7 +1106,7 @@ function_entry pdo_dbh_functions[] = {
/* {{{ overloaded object handlers for PDO class */
int pdo_hash_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
{
function_entry *funcs;
zend_function_entry *funcs;
zend_function func;
zend_internal_function *ifunc = (zend_internal_function*)&func;
int namelen;

4
ext/pdo/pdo_stmt.c
View file

@ -1965,7 +1965,7 @@ static PHP_METHOD(PDOStatement, __sleep)
}
/* }}} */
function_entry pdo_dbstmt_functions[] = {
zend_function_entry pdo_dbstmt_functions[] = {
PHP_ME(PDOStatement, execute, NULL, ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, fetch, NULL, ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, bindParam, second_arg_force_ref, ZEND_ACC_PUBLIC)
@ -2302,7 +2302,7 @@ zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object TSRML
/* {{{ overloaded handlers for PDORow class (used by PDO_FETCH_LAZY) */
function_entry pdo_row_functions[] = {
zend_function_entry pdo_row_functions[] = {
{NULL, NULL, NULL}
};

2
ext/pdo/php_pdo_driver.h
View file

@ -284,7 +284,7 @@ enum {
PDO_DBH_DRIVER_METHOD_KIND__MAX
};
typedef function_entry *(*pdo_dbh_get_driver_methods_func)(pdo_dbh_t *dbh, int kind TSRMLS_DC);
typedef zend_function_entry *(*pdo_dbh_get_driver_methods_func)(pdo_dbh_t *dbh, int kind TSRMLS_DC);
struct pdo_dbh_methods {
pdo_dbh_close_func closer;

6
ext/pdo/php_pdo_int.h
View file

@ -32,12 +32,12 @@ void pdo_dbh_init(TSRMLS_D);
void pdo_stmt_init(TSRMLS_D);
extern zend_object_value pdo_dbh_new(zend_class_entry *ce TSRMLS_DC);
extern function_entry pdo_dbh_functions[];
extern zend_function_entry pdo_dbh_functions[];
extern zend_class_entry *pdo_dbh_ce;
extern ZEND_RSRC_DTOR_FUNC(php_pdo_pdbh_dtor);
extern zend_object_value pdo_dbstmt_new(zend_class_entry *ce TSRMLS_DC);
extern function_entry pdo_dbstmt_functions[];
extern zend_function_entry pdo_dbstmt_functions[];
extern zend_class_entry *pdo_dbstmt_ce;
void pdo_dbstmt_free_storage(pdo_stmt_t *stmt TSRMLS_DC);
zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object TSRMLS_DC);
@ -46,7 +46,7 @@ int pdo_stmt_describe_columns(pdo_stmt_t *stmt TSRMLS_DC);
int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, int skip_first_arg);
extern zend_object_value pdo_row_new(zend_class_entry *ce TSRMLS_DC);
extern function_entry pdo_row_functions[];
extern zend_function_entry pdo_row_functions[];
extern zend_class_entry *pdo_row_ce;
void pdo_row_free_storage(pdo_stmt_t *stmt TSRMLS_DC);
extern zend_object_handlers pdo_row_object_handlers;

2
ext/pdo_dblib/pdo_dblib.c
View file

@ -34,7 +34,7 @@
ZEND_DECLARE_MODULE_GLOBALS(dblib)
function_entry pdo_dblib_functions[] = {
zend_function_entry pdo_dblib_functions[] = {
{NULL, NULL, NULL}
};

2
ext/pdo_firebird/pdo_firebird.c
View file

@ -30,7 +30,7 @@
#include "php_pdo_firebird.h"
#include "php_pdo_firebird_int.h"
function_entry pdo_firebird_functions[] = { /* {{{ */
zend_function_entry pdo_firebird_functions[] = { /* {{{ */
{NULL, NULL, NULL}
};
/* }}} */

2
ext/pdo_mysql/pdo_mysql.c
View file

@ -31,7 +31,7 @@
#include "php_pdo_mysql_int.h"
/* {{{ pdo_mysql_functions[] */
function_entry pdo_mysql_functions[] = {
zend_function_entry pdo_mysql_functions[] = {
{NULL, NULL, NULL}
};
/* }}} */

2
ext/pdo_oci/pdo_oci.c
View file

@ -31,7 +31,7 @@
#include "php_pdo_oci_int.h"
/* {{{ pdo_oci_functions[] */
function_entry pdo_oci_functions[] = {
zend_function_entry pdo_oci_functions[] = {
{NULL, NULL, NULL}
};
/* }}} */

2
ext/pdo_pgsql/pdo_pgsql.c
View file

@ -31,7 +31,7 @@
#include "php_pdo_pgsql_int.h"
/* {{{ pdo_pgsql_functions[] */
function_entry pdo_pgsql_functions[] = {
zend_function_entry pdo_pgsql_functions[] = {
{NULL, NULL, NULL}
};
/* }}} */

4
ext/pdo_pgsql/pgsql_driver.c
View file

@ -580,14 +580,14 @@ static PHP_METHOD(PDO, pgsqlLOBUnlink)
/* }}} */
static function_entry dbh_methods[] = {
static zend_function_entry dbh_methods[] = {
PHP_ME(PDO, pgsqlLOBCreate, NULL, ZEND_ACC_PUBLIC)
PHP_ME(PDO, pgsqlLOBOpen, NULL, ZEND_ACC_PUBLIC)
PHP_ME(PDO, pgsqlLOBUnlink, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
static function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
static zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
{
switch (kind) {
case PDO_DBH_DRIVER_METHOD_KIND_DBH:

2
ext/pdo_sqlite/pdo_sqlite.c
View file

@ -34,7 +34,7 @@
#define PHP_PDO_SQLITE_MODULE_VERSION "1.0.1"
/* {{{ pdo_sqlite_functions[] */
function_entry pdo_sqlite_functions[] = {
zend_function_entry pdo_sqlite_functions[] = {
{NULL, NULL, NULL}
};
/* }}} */

4
ext/pdo_sqlite/sqlite_driver.c
View file

@ -584,13 +584,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
RETURN_FALSE;
}
/* }}} */
static function_entry dbh_methods[] = {
static zend_function_entry dbh_methods[] = {
PHP_ME(SQLite, sqliteCreateFunction, NULL, ZEND_ACC_PUBLIC)
PHP_ME(SQLite, sqliteCreateAggregate, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
static function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
static zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
{
switch (kind) {
case PDO_DBH_DRIVER_METHOD_KIND_DBH:

2
ext/pgsql/pgsql.c
View file

@ -77,7 +77,7 @@
/* {{{ pgsql_functions[]
*/
function_entry pgsql_functions[] = {
zend_function_entry pgsql_functions[] = {
/* connection functions */
PHP_FE(pg_connect, NULL)
PHP_FE(pg_pconnect, NULL)

2
ext/posix/posix.c
View file

@ -52,7 +52,7 @@ ZEND_DECLARE_MODULE_GLOBALS(posix)
/* {{{ posix_functions[]
*/
function_entry posix_functions[] = {
zend_function_entry posix_functions[] = {
/* POSIX.1, 3.3 */
PHP_FE(posix_kill, NULL)

2
ext/pspell/pspell.c
View file

@ -52,7 +52,7 @@
/* {{{ pspell_functions[]
*/
function_entry pspell_functions[] = {
zend_function_entry pspell_functions[] = {
PHP_FE(pspell_new, NULL)
PHP_FE(pspell_new_personal, NULL)
PHP_FE(pspell_new_config, NULL)

6
ext/readline/readline.c
View file

@ -253,7 +253,7 @@ PHP_FUNCTION(readline_info)
Adds a line to the history */
PHP_FUNCTION(readline_add_history)
{
pval **arg;
zval **arg;
int ac = ZEND_NUM_ARGS();
if (ac != 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) {
@ -312,7 +312,7 @@ PHP_FUNCTION(readline_list_history)
Reads the history */
PHP_FUNCTION(readline_read_history)
{
pval **arg;
zval **arg;
char *filename = NULL;
int ac = ZEND_NUM_ARGS();
@ -339,7 +339,7 @@ PHP_FUNCTION(readline_read_history)
Writes the history */
PHP_FUNCTION(readline_write_history)
{
pval **arg;
zval **arg;
char *filename = NULL;
int ac = ZEND_NUM_ARGS();

2
ext/reflection/php_reflection.c
View file

@ -4146,7 +4146,7 @@ static zend_function_entry reflection_extension_functions[] = {
};
/* }}} */
function_entry reflection_ext_functions[] = { /* {{{ */
zend_function_entry reflection_ext_functions[] = { /* {{{ */
{NULL, NULL, NULL}
}; /* }}} */

2
ext/session/session.c
View file

@ -56,7 +56,7 @@
/* {{{ session_functions[]
*/
function_entry session_functions[] = {
zend_function_entry session_functions[] = {
PHP_FE(session_name, NULL)
PHP_FE(session_module_name, NULL)
PHP_FE(session_save_path, NULL)

2
ext/shmop/shmop.c
View file

@ -47,7 +47,7 @@ int shm_type;
/* {{{ shmop_functions[]
*/
function_entry shmop_functions[] = {
zend_function_entry shmop_functions[] = {
PHP_FE(shmop_open, NULL)
PHP_FE(shmop_read, NULL)
PHP_FE(shmop_close, NULL)

2
ext/simplexml/simplexml.c
View file

@ -1925,7 +1925,7 @@ PHP_FUNCTION(simplexml_import_dom)
}
/* }}} */
function_entry simplexml_functions[] = {
zend_function_entry simplexml_functions[] = {
PHP_FE(simplexml_load_file, NULL)
PHP_FE(simplexml_load_string, NULL)
PHP_FE(simplexml_import_dom, NULL)

2
ext/snmp/snmp.c
View file

@ -113,7 +113,7 @@ static oid objid_mib[] = {1, 3, 6, 1, 2, 1};
/* {{{ snmp_functions[]
*/
function_entry snmp_functions[] = {
zend_function_entry snmp_functions[] = {
PHP_FE(snmpget, NULL)
PHP_FE(snmpgetnext, NULL)
PHP_FE(snmpwalk, NULL)

4
ext/snmp/winsnmp.c
View file

@ -21,7 +21,7 @@ Created from the snmputil sample in the Microsoft SDK for NT
/* {{{ snmp_functions[]
*/
function_entry snmp_functions[] = {
zend_function_entry snmp_functions[] = {
{"snmpget", php3_snmpget, NULL},
{"snmpwalk", php3_snmpwalk, NULL},
{NULL,NULL,NULL}
@ -58,7 +58,7 @@ DLEXPORT zend_module_entry *get_module() { return &snmp_module_entry; }
/* {{{ _php_snmp
*/
void _php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st) {
pval *a1, *a2, *a3;
zval *a1, *a2, *a3;
INT operation;
LPSTR agent;
LPSTR community;

2
ext/soap/soap.c
View file

@ -2840,7 +2840,7 @@ PHP_METHOD(SoapClient, __setLocation)
#ifndef ZEND_ENGINE_2
static void soap_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference)
{
pval *object = property_reference->object;
zval *object = property_reference->object;
zend_overloaded_element *function_name = (zend_overloaded_element *)property_reference->elements_list->tail->data;
char *function = Z_STRVAL(function_name->element);
zend_function *builtin_function;

2
ext/sockets/sockets.c
View file

@ -112,7 +112,7 @@ static
/* {{{ sockets_functions[]
*/
function_entry sockets_functions[] = {
zend_function_entry sockets_functions[] = {
PHP_FE(socket_select, first_through_third_args_force_ref)
PHP_FE(socket_create, NULL)
PHP_FE(socket_create_listen, NULL)

4
ext/sqlite/pdo_sqlite2.c
View file

@ -477,12 +477,12 @@ static PHP_FUNCTION(sqlite2_create_function)
/* TODO: implement this stuff */
}
static function_entry dbh_methods[] = {
static zend_function_entry dbh_methods[] = {
PHP_FE(sqlite2_create_function, NULL)
{NULL, NULL, NULL}
};
static function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
static zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
{
switch (kind) {
case PDO_DBH_DRIVER_METHOD_KIND_DBH:

10
ext/sqlite/sqlite.c
View file

@ -163,7 +163,7 @@ static int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC);
enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM };
function_entry sqlite_functions[] = {
zend_function_entry sqlite_functions[] = {
PHP_FE(sqlite_open, third_arg_force_ref)
PHP_FE(sqlite_popen, third_arg_force_ref)
PHP_FE(sqlite_close, NULL)
@ -206,7 +206,7 @@ function_entry sqlite_functions[] = {
{NULL, NULL, NULL}
};
function_entry sqlite_funcs_db[] = {
zend_function_entry sqlite_funcs_db[] = {
PHP_ME_MAPPING(__construct, sqlite_open, third_arg_force_ref)
/* PHP_ME_MAPPING(close, sqlite_close, NULL)*/
PHP_ME_MAPPING(query, sqlite_query, third_arg_force_ref)
@ -226,7 +226,7 @@ function_entry sqlite_funcs_db[] = {
{NULL, NULL, NULL}
};
function_entry sqlite_funcs_query[] = {
zend_function_entry sqlite_funcs_query[] = {
PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL)
PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL)
PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL)
@ -250,7 +250,7 @@ function_entry sqlite_funcs_query[] = {
{NULL, NULL, NULL}
};
function_entry sqlite_funcs_ub_query[] = {
zend_function_entry sqlite_funcs_ub_query[] = {
PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL)
PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL)
PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL)
@ -265,7 +265,7 @@ function_entry sqlite_funcs_ub_query[] = {
{NULL, NULL, NULL}
};
function_entry sqlite_funcs_exception[] = {
zend_function_entry sqlite_funcs_exception[] = {
{NULL, NULL, NULL}
};

2
ext/sybase/php_sybase_db.c
View file

@ -80,7 +80,7 @@ typedef struct {
} sybase_result;
function_entry sybase_functions[] = {
zend_function_entry sybase_functions[] = {
PHP_FE(sybase_connect, NULL)
PHP_FE(sybase_pconnect, NULL)
PHP_FE(sybase_close, NULL)

2
ext/sybase_ct/php_sybase_ct.c
View file

@ -37,7 +37,7 @@ static int le_link, le_plink, le_result;
#if HAVE_SYBASE_CT
function_entry sybase_functions[] = {
zend_function_entry sybase_functions[] = {
PHP_FE(sybase_connect, NULL)
PHP_FE(sybase_pconnect, NULL)
PHP_FE(sybase_close, NULL)

2
ext/sysvmsg/sysvmsg.c
View file

@ -66,7 +66,7 @@ static
*
* Every user visible function must have an entry in sysvmsg_functions[].
*/
function_entry sysvmsg_functions[] = {
zend_function_entry sysvmsg_functions[] = {
PHP_FE(msg_get_queue, NULL)
PHP_FE(msg_send, sixth_arg_force_ref)
PHP_FE(msg_receive, msg_receive_args_force_ref)

2
ext/sysvsem/sysvsem.c
View file

@ -58,7 +58,7 @@ union semun {
/* {{{ sysvsem_functions[]
*/
function_entry sysvsem_functions[] = {
zend_function_entry sysvsem_functions[] = {
PHP_FE(sem_get, NULL)
PHP_FE(sem_acquire, NULL)
PHP_FE(sem_release, NULL)

2
ext/sysvshm/sysvshm.c
View file

@ -40,7 +40,7 @@
/* {{{ sysvshm_functions[]
*/
function_entry sysvshm_functions[] = {
zend_function_entry sysvshm_functions[] = {
PHP_FE(shm_attach, NULL)
PHP_FE(shm_remove, NULL)
PHP_FE(shm_detach, NULL)

8
ext/tidy/tidy.c
View file

@ -237,7 +237,7 @@ STD_PHP_INI_ENTRY("tidy.default_config", "", PHP_INI_SYSTEM, OnUpdateString, d
PHP_INI_ENTRY("tidy.clean_output", "0", PHP_INI_PERDIR, NULL)
PHP_INI_END()
function_entry tidy_functions[] = {
zend_function_entry tidy_functions[] = {
PHP_FE(tidy_getopt, NULL)
PHP_FE(tidy_parse_string, NULL)
PHP_FE(tidy_parse_file, NULL)
@ -268,7 +268,7 @@ function_entry tidy_functions[] = {
{NULL, NULL, NULL}
};
function_entry tidy_funcs_doc[] = {
zend_function_entry tidy_funcs_doc[] = {
TIDY_METHOD_MAP(getOpt, tidy_getopt, NULL)
TIDY_METHOD_MAP(cleanRepair, tidy_clean_repair, NULL)
TIDY_DOC_ME(parseFile, NULL)
@ -293,7 +293,7 @@ function_entry tidy_funcs_doc[] = {
{NULL, NULL, NULL}
};
function_entry tidy_funcs_node[] = {
zend_function_entry tidy_funcs_node[] = {
TIDY_NODE_ME(__construct, NULL)
TIDY_NODE_ME(hasChildren, NULL)
TIDY_NODE_ME(hasSiblings, NULL)
@ -306,7 +306,7 @@ function_entry tidy_funcs_node[] = {
{NULL, NULL, NULL}
};
function_entry tidy_funcs_exception[] = {
zend_function_entry tidy_funcs_exception[] = {
{NULL, NULL, NULL}
};

2
ext/tokenizer/tokenizer.c
View file

@ -103,7 +103,7 @@ ZEND_DECLARE_MODULE_GLOBALS(tokenizer)
*
* Every user visible function must have an entry in tokenizer_functions[].
*/
function_entry tokenizer_functions[] = {
zend_function_entry tokenizer_functions[] = {
PHP_FE(token_get_all, NULL)
PHP_FE(token_name, NULL)
{NULL, NULL, NULL} /* Must be the last line in tokenizer_functions[] */

2
ext/wddx/wddx.c
View file

@ -99,7 +99,7 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len);
/* {{{ wddx_functions[]
*/
function_entry wddx_functions[] = {
zend_function_entry wddx_functions[] = {
PHP_FE(wddx_serialize_value, NULL)
PHP_FE(wddx_serialize_vars, NULL)
PHP_FE(wddx_packet_start, NULL)

2
ext/xml/xml.c
View file

@ -111,7 +111,7 @@ static
ZEND_ARG_PASS_INFO(1)
ZEND_END_ARG_INFO();
function_entry xml_functions[] = {
zend_function_entry xml_functions[] = {
PHP_FE(xml_parser_create, NULL)
PHP_FE(xml_parser_create_ns, NULL)
PHP_FE(xml_set_object, second_arg_force_ref)

4
ext/xmlrpc/xmlrpc-epi-php.c
View file

@ -80,7 +80,7 @@ ZEND_DECLARE_MODULE_GLOBALS(xmlrpc)
static int le_xmlrpc_server;
function_entry xmlrpc_functions[] = {
zend_function_entry xmlrpc_functions[] = {
PHP_FE(xmlrpc_encode, NULL)
PHP_FE(xmlrpc_decode, NULL)
PHP_FE(xmlrpc_decode_request, second_arg_force_ref)
@ -1330,7 +1330,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype)
if(v) {
time_t timestamp = XMLRPC_GetValueDateTime(v);
if(timestamp) {
pval* ztimestamp;
zval* ztimestamp;
MAKE_STD_ZVAL(ztimestamp);

2
ext/xsl/php_xsl.c
View file

@ -38,7 +38,7 @@ static zend_object_handlers xsl_object_handlers;
*
* Every user visible function must have an entry in xsl_functions[].
*/
function_entry xsl_functions[] = {
zend_function_entry xsl_functions[] = {
{NULL, NULL, NULL} /* Must be the last line in xsl_functions[] */
};
/* }}} */

2
ext/zlib/zlib.c
View file

@ -86,7 +86,7 @@ static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
/* {{{ php_zlib_functions[]
*/
function_entry php_zlib_functions[] = {
zend_function_entry php_zlib_functions[] = {
PHP_FE(readgzfile, NULL)
PHP_FALIAS(gzrewind, rewind, NULL)
PHP_FALIAS(gzclose, fclose, NULL)

2
sapi/aolserver/aolserver.c
View file

@ -240,7 +240,7 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
PHP_FUNCTION(getallheaders);
static function_entry aolserver_functions[] = {
static zend_function_entry aolserver_functions[] = {
PHP_FE(getallheaders, NULL)
{NULL, NULL, NULL}
};

2
sapi/apache/php_apache.c
View file

@ -51,7 +51,7 @@ PHP_FUNCTION(apache_reset_timeout);
PHP_MINFO_FUNCTION(apache);
function_entry apache_functions[] = {
zend_function_entry apache_functions[] = {
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
PHP_FE(apache_note, NULL)

2
sapi/apache2filter/php_functions.c
View file

@ -355,7 +355,7 @@ PHP_MINFO_FUNCTION(apache)
php_info_print_table_end();
}
static function_entry apache_functions[] = {
static zend_function_entry apache_functions[] = {
PHP_FE(apache_lookup_uri, NULL)
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)

2
sapi/apache2handler/php_functions.c
View file

@ -462,7 +462,7 @@ PHP_MINFO_FUNCTION(apache)
}
}
static function_entry apache_functions[] = {
static zend_function_entry apache_functions[] = {
PHP_FE(apache_lookup_uri, NULL)
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)

4
sapi/apache_hooks/php_apache.c
View file

@ -60,7 +60,7 @@ PHP_FUNCTION(apache_get_modules);
PHP_MINFO_FUNCTION(apache);
function_entry apache_functions[] = {
zend_function_entry apache_functions[] = {
PHP_FE(virtual, NULL)
PHP_FE(apache_request_headers, NULL)
PHP_FE(apache_note, NULL)
@ -1286,7 +1286,7 @@ PHP_FUNCTION(apache_request_send_header_field)
/* {{{ php_apache_request_class_functions
*/
static function_entry php_apache_request_class_functions[] = {
static zend_function_entry php_apache_request_class_functions[] = {
/* string slots */
PHP_FALIAS(args, apache_request_args, NULL)
PHP_FALIAS(boundary, apache_request_boundary, NULL)

2
sapi/continuity/capi.c
View file

@ -80,7 +80,7 @@ PHP_FUNCTION(continuity_virtual);
PHP_FUNCTION(continuity_request_headers);
PHP_FUNCTION(continuity_response_headers);
function_entry continuity_functions[] = {
zend_function_entry continuity_functions[] = {
{NULL, NULL, NULL}
};

2
sapi/milter/php_milter.c
View file

@ -748,7 +748,7 @@ PHP_MINFO_FUNCTION(milter)
/* {{{ milter_functions[]
*/
static function_entry milter_functions[] = {
static zend_function_entry milter_functions[] = {
PHP_FE(smfi_setflags, NULL)
PHP_FE(smfi_settimeout, NULL)
PHP_FE(smfi_getsymval, NULL)

2
sapi/nsapi/nsapi.c
View file

@ -174,7 +174,7 @@ ZEND_DECLARE_MODULE_GLOBALS(nsapi)
*
* Every user visible function must have an entry in nsapi_functions[].
*/
function_entry nsapi_functions[] = {
zend_function_entry nsapi_functions[] = {
PHP_FE(nsapi_virtual, NULL) /* Make subrequest */
PHP_FALIAS(virtual, nsapi_virtual, NULL) /* compatibility */
PHP_FE(nsapi_request_headers, NULL) /* get request headers */