Skip to content

Commit 3e669bc

Browse files
author
foobar
committed
MFH: nuke php3 legacy
1 parent 347032c commit 3e669bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+119
-119
lines changed

‎ext/bcmath/bcmath.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
ZEND_DECLARE_MODULE_GLOBALS(bcmath);
3535

36-
function_entry bcmath_functions[] = {
36+
zend_function_entry bcmath_functions[] = {
3737
PHP_FE(bcadd, NULL)
3838
PHP_FE(bcsub, NULL)
3939
PHP_FE(bcmul, NULL)

‎ext/bz2/bz2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#define PHP_BZ_ERRSTR 1
4141
#define PHP_BZ_ERRBOTH 2
4242

43-
function_entry bz2_functions[] = {
43+
zend_function_entry bz2_functions[] = {
4444
PHP_FE(bzopen, NULL)
4545
PHP_FE(bzread, NULL)
4646
PHP_FALIAS(bzwrite, fwrite, NULL)

‎ext/calendar/cal_unix.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
Convert UNIX timestamp to Julian Day */
2929
PHP_FUNCTION(unixtojd)
3030
{
31-
pval *timestamp;
31+
zval *timestamp;
3232
long jdate;
3333
time_t t;
3434
struct tm *ta, tmbuf;
@@ -60,7 +60,7 @@ PHP_FUNCTION(unixtojd)
6060
Convert Julian Day to UNIX timestamp */
6161
PHP_FUNCTION(jdtounix)
6262
{
63-
pval *jday;
63+
zval *jday;
6464
long uday;
6565

6666
if ((ZEND_NUM_ARGS()!= 1) || (zend_get_parameters(ht, 1, &jday) != SUCCESS)) {

‎ext/calendar/calendar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
#include <stdio.h>
3737

38-
function_entry calendar_functions[] = {
38+
zend_function_entry calendar_functions[] = {
3939
PHP_FE(jdtogregorian, NULL)
4040
PHP_FE(gregoriantojd, NULL)
4141
PHP_FE(jdtojulian, NULL)

‎ext/com_dotnet/com_extension.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ zend_class_entry
3737
*php_com_exception_class_entry,
3838
*php_com_saproxy_class_entry;
3939

40-
function_entry com_dotnet_functions[] = {
40+
zend_function_entry com_dotnet_functions[] = {
4141
PHP_FE(variant_set, NULL)
4242
PHP_FE(variant_add, NULL)
4343
PHP_FE(variant_cat, NULL)

‎ext/ctype/ctype.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ZEND_DECLARE_MODULE_GLOBALS(ctype)
4343
/* {{{ ctype_functions[]
4444
* Every user visible function must have an entry in ctype_functions[].
4545
*/
46-
function_entry ctype_functions[] = {
46+
zend_function_entry ctype_functions[] = {
4747
PHP_FE(ctype_alnum, NULL)
4848
PHP_FE(ctype_alpha, NULL)
4949
PHP_FE(ctype_cntrl, NULL)

‎ext/curl/interface.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
130130

131131
/* {{{ curl_functions[]
132132
*/
133-
function_entry curl_functions[] = {
133+
zend_function_entry curl_functions[] = {
134134
PHP_FE(curl_init, NULL)
135135
PHP_FE(curl_copy_handle, NULL)
136136
PHP_FE(curl_version, NULL)

‎ext/dba/dba.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
/* {{{ dba_functions[]
5555
*/
56-
function_entry dba_functions[] = {
56+
zend_function_entry dba_functions[] = {
5757
PHP_FE(dba_open, NULL)
5858
PHP_FE(dba_popen, NULL)
5959
PHP_FE(dba_close, NULL)

‎ext/dbase/dbase.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ PHP_FUNCTION(dbase_create)
730730

731731
/* {{{ dbase_functions[]
732732
*/
733-
function_entry dbase_functions[] = {
733+
zend_function_entry dbase_functions[] = {
734734
PHP_FE(dbase_open, NULL)
735735
PHP_FE(dbase_create, NULL)
736736
PHP_FE(dbase_close, NULL)

‎ext/dom/dom_iterators.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC)
189189
dom_nnodemap_object *objmap;
190190
int ret, previndex=1;
191191
HashTable *nodeht;
192-
pval **entry;
192+
zval **entry;
193193

194194
php_dom_iterator *iterator = (php_dom_iterator *)iter;
195195

@@ -258,7 +258,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object TS
258258
zval *curattr = NULL;
259259
int ret, curindex = 0;
260260
HashTable *nodeht;
261-
pval **entry;
261+
zval **entry;
262262

263263
php_dom_iterator *iterator = emalloc(sizeof(php_dom_iterator));
264264

‎ext/dom/nodelist.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ PHP_FUNCTION(dom_nodelist_item)
109109
xmlNodePtr nodep, curnode;
110110
int count = 0;
111111
HashTable *nodeht;
112-
pval **entry;
112+
zval **entry;
113113

114114
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) {
115115
return;

‎ext/exif/exif.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ZEND_END_ARG_INFO();
105105

106106
/* {{{ exif_functions[]
107107
*/
108-
function_entry exif_functions[] = {
108+
zend_function_entry exif_functions[] = {
109109
PHP_FE(exif_read_data, NULL)
110110
PHP_FALIAS(read_exif_data, exif_read_data, NULL)
111111
PHP_FE(exif_tagname, NULL)
@@ -1843,7 +1843,7 @@ static void exif_iif_free(image_info_type *image_info, int section_index) {
18431843

18441844
/* {{{ add_assoc_image_info
18451845
* Add image_info to associative array value. */
1846-
static void add_assoc_image_info(pval *value, int sub_array, image_info_type *image_info, int section_index TSRMLS_DC)
1846+
static void add_assoc_image_info(zval *value, int sub_array, image_info_type *image_info, int section_index TSRMLS_DC)
18471847
{
18481848
char buffer[64], *val, *name, uname[64];
18491849
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
18521852
#endif
18531853
image_info_value *info_value;
18541854
image_info_data *info_data;
1855-
pval *tmpi, *array = NULL;
1855+
zval *tmpi, *array = NULL;
18561856

18571857
#ifdef EXIF_DEBUG
18581858
/* 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)
22482248
Get headername for index or false if not defined */
22492249
PHP_FUNCTION(exif_tagname)
22502250
{
2251-
pval **p_num;
2251+
zval **p_num;
22522252
int tag, ac = ZEND_NUM_ARGS();
22532253
char *szTemp;
22542254

@@ -3780,7 +3780,7 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
37803780
Reads header data from the JPEG/TIFF image filename and optionally reads the internal thumbnails */
37813781
PHP_FUNCTION(exif_read_data)
37823782
{
3783-
pval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all;
3783+
zval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all;
37843784
int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0, sub_arrays=0, read_thumbnail=0, read_all=0;
37853785
image_info_type ImageInfo;
37863786
char tmp[64], *sections_str, *s;

‎ext/fbsql/php_fbsql.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ char *DigestPassword(char *user, char *password)
183183

184184
/* {{{ fbsql_functions[]
185185
*/
186-
function_entry fbsql_functions[] = {
186+
zend_function_entry fbsql_functions[] = {
187187
PHP_FE(fbsql_connect, NULL)
188188
PHP_FE(fbsql_pconnect, NULL)
189189
PHP_FE(fbsql_close, NULL)

‎ext/fdf/fdf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ SAPI_POST_HANDLER_FUNC(fdf_post_handler);
4949

5050
/* {{{ fdf_functions[]
5151
*/
52-
function_entry fdf_functions[] = {
52+
zend_function_entry fdf_functions[] = {
5353
PHP_FE(fdf_add_template, NULL)
5454
PHP_FE(fdf_close, NULL)
5555
PHP_FE(fdf_create, NULL)

‎ext/filepro/filepro.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ PHP_MSHUTDOWN_FUNCTION(filepro)
162162
}
163163
/* }}} */
164164

165-
function_entry filepro_functions[] = {
165+
zend_function_entry filepro_functions[] = {
166166
PHP_FE(filepro, NULL)
167167
PHP_FE(filepro_rowcount, NULL)
168168
PHP_FE(filepro_fieldname, NULL)

‎ext/ftp/php_ftp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static
5151
ZEND_ARG_PASS_INFO(1)
5252
ZEND_END_ARG_INFO()
5353

54-
function_entry php_ftp_functions[] = {
54+
zend_function_entry php_ftp_functions[] = {
5555
PHP_FE(ftp_connect, NULL)
5656
#if HAVE_OPENSSL_EXT
5757
PHP_FE(ftp_ssl_connect, NULL)
@@ -316,7 +316,7 @@ PHP_FUNCTION(ftp_chdir)
316316
Requests execution of a program on the FTP server */
317317
PHP_FUNCTION(ftp_exec)
318318
{
319-
pval *z_ftp;
319+
zval *z_ftp;
320320
ftpbuf_t *ftp;
321321
char *cmd;
322322
int cmd_len;

‎ext/gd/gd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold
163163

164164
/* {{{ gd_functions[]
165165
*/
166-
function_entry gd_functions[] = {
166+
zend_function_entry gd_functions[] = {
167167
PHP_FE(gd_info, NULL)
168168
PHP_FE(imagearc, NULL)
169169
PHP_FE(imageellipse, NULL)

‎ext/gettext/gettext.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
/* {{{ php_gettext_functions[]
3434
*/
35-
function_entry php_gettext_functions[] = {
35+
zend_function_entry php_gettext_functions[] = {
3636
PHP_NAMED_FE(textdomain, zif_textdomain, NULL)
3737
PHP_NAMED_FE(gettext, zif_gettext, NULL)
3838
/* Alias for gettext() */

‎ext/gmp/gmp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static int le_gmp;
3939

4040
/* {{{ gmp_functions[]
4141
*/
42-
function_entry gmp_functions[] = {
42+
zend_function_entry gmp_functions[] = {
4343
ZEND_FE(gmp_init, NULL)
4444
ZEND_FE(gmp_intval, NULL)
4545
ZEND_FE(gmp_strval, NULL)

‎ext/hash/hash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ PHP_MINFO_FUNCTION(hash)
596596

597597
/* {{{ hash_functions[]
598598
*/
599-
function_entry hash_functions[] = {
599+
zend_function_entry hash_functions[] = {
600600
PHP_FE(hash, NULL)
601601
PHP_FE(hash_file, NULL)
602602

‎ext/hwapi/hwapi.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static zend_class_entry *hw_api_reason_class_entry_ptr;
6767
//}
6868
//#endif
6969

70-
function_entry hwapi_functions[] = {
70+
zend_function_entry hwapi_functions[] = {
7171
PHP_FE(hwapi_dummy, NULL)
7272
PHP_FE(hwapi_init, NULL)
7373
PHP_FE(hwapi_hgcsp, NULL)
@@ -102,7 +102,7 @@ function_entry hwapi_functions[] = {
102102
{NULL, NULL, NULL}
103103
};
104104

105-
static function_entry php_hw_api_functions[] = {
105+
static zend_function_entry php_hw_api_functions[] = {
106106
{"hgcsp", PHP_FN(hwapi_hgcsp), NULL},
107107
{"object", PHP_FN(hwapi_object), NULL},
108108
{"children", PHP_FN(hwapi_children), NULL},
@@ -148,7 +148,7 @@ static function_entry php_hw_api_functions[] = {
148148
{NULL, NULL, NULL}
149149
};
150150

151-
static function_entry php_hw_api_object_functions[] = {
151+
static zend_function_entry php_hw_api_object_functions[] = {
152152
{"hw_api_object", PHP_FN(hwapi_object_new), NULL},
153153
{"count", PHP_FN(hwapi_object_count), NULL},
154154
{"title", PHP_FN(hwapi_object_title), NULL},
@@ -161,7 +161,7 @@ static function_entry php_hw_api_object_functions[] = {
161161
{NULL, NULL, NULL}
162162
};
163163

164-
static function_entry php_hw_api_attribute_functions[] = {
164+
static zend_function_entry php_hw_api_attribute_functions[] = {
165165
{"hw_api_attribute", PHP_FN(hwapi_attribute_new), NULL},
166166
{"key", PHP_FN(hwapi_attribute_key), NULL},
167167
{"value", PHP_FN(hwapi_attribute_value), NULL},
@@ -170,20 +170,20 @@ static function_entry php_hw_api_attribute_functions[] = {
170170
{NULL, NULL, NULL}
171171
};
172172

173-
static function_entry php_hw_api_error_functions[] = {
173+
static zend_function_entry php_hw_api_error_functions[] = {
174174
{"count", PHP_FN(hwapi_error_count), NULL},
175175
{"reason", PHP_FN(hwapi_error_reason), NULL},
176176
{NULL, NULL, NULL}
177177
};
178178

179-
static function_entry php_hw_api_content_functions[] = {
179+
static zend_function_entry php_hw_api_content_functions[] = {
180180
{"hw_api_content", PHP_FN(hwapi_content_new), NULL},
181181
{"read", PHP_FN(hwapi_content_read), NULL},
182182
{"mimetype", PHP_FN(hwapi_content_mimetype), NULL},
183183
{NULL, NULL, NULL}
184184
};
185185

186-
static function_entry php_hw_api_reason_functions[] = {
186+
static zend_function_entry php_hw_api_reason_functions[] = {
187187
{"type", PHP_FN(hwapi_reason_type), NULL},
188188
{"description", PHP_FN(hwapi_reason_description), NULL},
189189
{NULL, NULL, NULL}

‎ext/iconv/iconv.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
/* {{{ iconv_functions[]
6666
*/
67-
function_entry iconv_functions[] = {
67+
zend_function_entry iconv_functions[] = {
6868
PHP_NAMED_FE(iconv,php_if_iconv, NULL)
6969
PHP_FE(ob_iconv_handler, NULL)
7070
PHP_FE(iconv_get_encoding, NULL)

‎ext/imap/php_imap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void *fs_get(size_t size);
7979

8080
/* {{{ imap_functions[]
8181
*/
82-
function_entry imap_functions[] = {
82+
zend_function_entry imap_functions[] = {
8383
PHP_FE(imap_open, NULL)
8484
PHP_FE(imap_reopen, NULL)
8585
PHP_FE(imap_close, NULL)

‎ext/informix/ifx.ec

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ typedef char IFX[128];
140140
} \
141141
} while (0)
142142

143-
function_entry ifx_functions[] = {
143+
zend_function_entry ifx_functions[] = {
144144
PHP_FE(ifx_connect, NULL)
145145
PHP_FE(ifx_pconnect, NULL)
146146
PHP_FE(ifx_close, NULL)

‎ext/interbase/interbase.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
#include "php_interbase.h"
3737
#include "php_ibase_includes.h"
3838
#include "SAPI.h"
39-
39+
5B
4040
#include <time.h>
4141

4242
#define ROLLBACK 0
4343
#define COMMIT 1
4444
#define RETAIN 2
4545

4646
/* {{{ extension definition structures */
47-
function_entry ibase_functions[] = {
47+
zend_function_entry ibase_functions[] = {
4848
PHP_FE(ibase_connect, NULL)
4949
PHP_FE(ibase_pconnect, NULL)
5050
PHP_FE(ibase_close, NULL)

‎ext/ldap/ldap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static int le_link, le_result, le_result_entry, le_ber_entry;
9797
*/
9898
/* {{{ ldap_functions[]
9999
*/
100-
function_entry ldap_functions[] = {
100+
zend_function_entry ldap_functions[] = {
101101
PHP_FE(ldap_connect, NULL)
102102
PHP_FALIAS(ldap_close, ldap_unbind, NULL)
103103
PHP_FE(ldap_bind, NULL)

‎ext/libxml/libxml.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ PHP_MINFO_FUNCTION(libxml);
8787
/* }}} */
8888

8989
/* {{{ extension definition structures */
90-
function_entry libxml_functions[] = {
90+
zend_function_entry libxml_functions[] = {
9191
PHP_FE(libxml_set_streams_context, NULL)
9292
PHP_FE(libxml_use_internal_errors, NULL)
9393
PHP_FE(libxml_get_last_error, NULL)

‎ext/mcrypt/mcrypt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ typedef struct _php_mcrypt {
4343
zend_bool init;
4444
} php_mcrypt;
4545

46-
function_entry mcrypt_functions[] = {
46+
zend_function_entry mcrypt_functions[] = {
4747
PHP_FE(mcrypt_ecb, NULL)
4848
PHP_FE(mcrypt_cbc, NULL)
4949
PHP_FE(mcrypt_cfb, NULL)

‎ext/mhash/mhash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "php_globals.h"
3434
#include "ext/standard/info.h"
3535

36-
function_entry mhash_functions[] = {
36+
zend_function_entry mhash_functions[] = {
3737
PHP_FE(mhash_get_block_size, NULL)
3838
PHP_FE(mhash_get_hash_name, NULL)
3939
PHP_FE(mhash_keygen_s2k, NULL)

‎ext/mime_magic/mime_magic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ ZEND_DECLARE_MODULE_GLOBALS(mime_magic)
218218
static magic_server_config_rec mime_global;
219219

220220
/* {{{ mime_magic_functions[] */
221-
function_entry mime_magic_functions[] = {
221+
zend_function_entry mime_magic_functions[] = {
222222
PHP_FE(mime_content_type, NULL)
223223
{NULL, NULL, NULL}
224224
};

0 commit comments

Comments
 (0)