Skip to content

Commit af59e92

Browse files
weltlingweltling
committed
master renames phase 7
1 parent b9514bb commit af59e92

File tree

103 files changed

+273
-273
lines changed

Some content is hidden

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

103 files changed

+273
-273
lines changed

‎Zend/zend_API.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
458458
case IS_FALSE:
459459
case IS_TRUE:
460460
case IS_LONG:
461-
convert_to_int_ex(arg);
461+
convert_to_long_ex(arg);
462462
*p = Z_LVAL_P(arg);
463463
break;
464464

‎Zend/zend_compile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6998,7 +6998,7 @@ void zend_do_declare_begin(TSRMLS_D) /* {{{ */
69986998
void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) /* {{{ */
69996999
{
70007000
if (!zend_binary_strcasecmp(Z_STRVAL(var->u.constant), Z_STRLEN(var->u.constant), "ticks", sizeof("ticks")-1)) {
7001-
convert_to_int(&val->u.constant);
7001+
convert_to_long(&val->u.constant);
70027002
CG(declarables).ticks = val->u.constant;
70037003
} else if (!zend_binary_strcasecmp(Z_STRVAL(var->u.constant), Z_STRLEN(var->u.constant), "encoding", sizeof("encoding")-1)) {
70047004
if (Z_TYPE(val->u.constant) == IS_CONSTANT) {

‎Zend/zend_exceptions.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ ZEND_METHOD(exception, __toString)
667667

668668
convert_to_string_ex(&message);
669669
convert_to_string_ex(&file);
670-
convert_to_int_ex(&line);
670+
convert_to_long_ex(&line);
671671

672672
fci.size = sizeof(fci);
673673
fci.function_table = &Z_OBJCE_P(exception)->function_table;
@@ -910,7 +910,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity TSRMLS_DC) /* {
910910

911911
convert_to_string_ex(str);
912912
convert_to_string_ex(file);
913-
convert_to_int_ex(line);
913+
convert_to_long_ex(line);
914914

915915
zend_error_va(severity, (Z_STRLEN_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_LVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str));
916916
} else {

‎Zend/zend_operators.c

+25-25
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
219219
}
220220
break;
221221
case IS_OBJECT:
222-
convert_to_int_base(op, 10);
222+
convert_to_long_base(op, 10);
223223
break;
224224
}
225225
}
@@ -256,7 +256,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
256256
break; \
257257
case IS_OBJECT: \
258258
ZVAL_DUP(&(holder), op); \
259-
convert_to_int_base(&(holder), 10); \
259+
convert_to_long_base(&(holder), 10); \
260260
if (Z_TYPE(holder) == IS_LONG) { \
261261
(op) = &(holder); \
262262
} \
@@ -266,10 +266,10 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
266266

267267
/* }}} */
268268

269-
/* {{{ zendi_convert_to_int */
270-
#define zendi_convert_to_int(op, holder, result) \
269+
/* {{{ zendi_convert_to_long */
270+
#define zendi_convert_to_long(op, holder, result) \
271271
if (op == result) { \
272-
convert_to_int(op); \
272+
convert_to_long(op); \
273273
} else if (Z_TYPE_P(op) != IS_LONG) { \
274274
switch (Z_TYPE_P(op)) { \
275275
case IS_NULL: \
@@ -290,7 +290,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
290290
break; \
291291
case IS_OBJECT: \
292292
ZVAL_DUP(&(holder), (op)); \
293-
convert_to_int_base(&(holder), 10); \
293+
convert_to_long_base(&(holder), 10); \
294294
break; \
295295
case IS_RESOURCE: \
296296
ZVAL_LONG(&holder, Z_RES_HANDLE_P(op)); \
@@ -368,15 +368,15 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC) /* {{{ */
368368

369369
/* }}} */
370370

371-
ZEND_API void convert_to_int(zval *op) /* {{{ */
371+
ZEND_API void convert_to_long(zval *op) /* {{{ */
372372
{
373373
if (Z_TYPE_P(op) != IS_LONG) {
374-
convert_to_int_base(op, 10);
374+
convert_to_long_base(op, 10);
375375
}
376376
}
377377
/* }}} */
378378

379-
ZEND_API void convert_to_int_base(zval *op, int base) /* {{{ */
379+
ZEND_API void convert_to_long_base(zval *op, int base) /* {{{ */
380380
{
381381
zend_long tmp;
382382

@@ -419,7 +419,7 @@ ZEND_API void convert_to_int_base(zval *op, int base) /* {{{ */
419419
zval dst;
420420
TSRMLS_FETCH();
421421

422-
convert_object_to_type(op, &dst, IS_LONG, convert_to_int);
422+
convert_object_to_type(op, &dst, IS_LONG, convert_to_long);
423423
zval_dtor(op);
424424

425425
if (Z_TYPE(dst) == IS_LONG) {
@@ -736,7 +736,7 @@ ZEND_API void convert_to_object(zval *op) /* {{{ */
736736
}
737737
/* }}} */
738738

739-
ZEND_API void multi_convert_to_int_ex(int argc, ...) /* {{{ */
739+
ZEND_API void multi_convert_to_long_ex(int argc, ...) /* {{{ */
740740
{
741741
zval *arg;
742742
va_list ap;
@@ -745,7 +745,7 @@ ZEND_API void multi_convert_to_int_ex(int argc, ...) /* {{{ */
745745

746746
while (argc--) {
747747
arg = va_arg(ap, zval *);
748-
convert_to_int_ex(arg);
748+
convert_to_long_ex(arg);
749749
}
750750

751751
va_end(ap);
@@ -806,7 +806,7 @@ ZEND_API zend_long _zval_get_long_func(zval *op TSRMLS_DC) /* {{{ */
806806
case IS_OBJECT:
807807
{
808808
zval dst;
809-
convert_object_to_type(op, &dst, IS_LONG, convert_to_int);
809+
convert_object_to_type(op, &dst, IS_LONG, convert_to_long);
810810
if (Z_TYPE(dst) == IS_LONG) {
811811
return Z_LVAL(dst);
812812
} else {
@@ -1249,9 +1249,9 @@ ZEND_API int mod_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
12491249
if (Z_TYPE_P(op1) != IS_LONG || Z_TYPE_P(op2) != IS_LONG) {
12501250
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_MOD);
12511251

1252-
zendi_convert_to_int(op1, op1_copy, result);
1252+
zendi_convert_to_long(op1, op1_copy, result);
12531253
op1_lval = Z_LVAL_P(op1);
1254-
zendi_convert_to_int(op2, op2_copy, result);
1254+
zendi_convert_to_long(op2, op2_copy, result);
12551255
} else {
12561256
op1_lval = Z_LVAL_P(op1);
12571257
}
@@ -1376,9 +1376,9 @@ ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /
13761376
if (Z_TYPE_P(op1) != IS_LONG || Z_TYPE_P(op2) != IS_LONG) {
13771377
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_BW_OR);
13781378

1379-
zendi_convert_to_int(op1, op1_copy, result);
1379+
zendi_convert_to_long(op1, op1_copy, result);
13801380
op1_lval = Z_LVAL_P(op1);
1381-
zendi_convert_to_int(op2, op2_copy, result);
1381+
zendi_convert_to_long(op2, op2_copy, result);
13821382
} else {
13831383
op1_lval = Z_LVAL_P(op1);
13841384
}
@@ -1421,9 +1421,9 @@ ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
14211421
if (Z_TYPE_P(op1) != IS_LONG || Z_TYPE_P(op2) != IS_LONG) {
14221422
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_BW_AND);
14231423

1424-
zendi_convert_to_int(op1, op1_copy, result);
1424+
zendi_convert_to_long(op1, op1_copy, result);
14251425
op1_lval = Z_LVAL_P(op1);
1426-
zendi_convert_to_int(op2, op2_copy, result);
1426+
zendi_convert_to_long(op2, op2_copy, result);
14271427
} else {
14281428
op1_lval = Z_LVAL_P(op1);
14291429
}
@@ -1466,9 +1466,9 @@ ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
14661466
if (Z_TYPE_P(op1) != IS_LONG || Z_TYPE_P(op2) != IS_LONG) {
14671467
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_BW_XOR);
14681468

1469-
zendi_convert_to_int(op1, op1_copy, result);
1469+
zendi_convert_to_long(op1, op1_copy, result);
14701470
op1_lval = Z_LVAL_P(op1);
1471-
zendi_convert_to_int(op2, op2_copy, result);
1471+
zendi_convert_to_long(op2, op2_copy, result);
14721472
} else {
14731473
op1_lval = Z_LVAL_P(op1);
14741474
}
@@ -1486,9 +1486,9 @@ ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /
14861486
if (Z_TYPE_P(op1) != IS_LONG || Z_TYPE_P(op2) != IS_LONG) {
14871487
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_SL);
14881488

1489-
zendi_convert_to_int(op1, op1_copy, result);
1489+
zendi_convert_to_long(op1, op1_copy, result);
14901490
op1_lval = Z_LVAL_P(op1);
1491-
zendi_convert_to_int(op2, op2_copy, result);
1491+
zendi_convert_to_long(op2, op2_copy, result);
14921492
} else {
14931493
op1_lval = Z_LVAL_P(op1);
14941494
}
@@ -1506,9 +1506,9 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
15061506
if (Z_TYPE_P(op1) != IS_LONG || Z_TYPE_P(op2) != IS_LONG) {
15071507
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_SR);
15081508

1509-
zendi_convert_to_int(op1, op1_copy, result);
1509+
zendi_convert_to_long(op1, op1_copy, result);
15101510
op1_lval = Z_LVAL_P(op1);
1511-
zendi_convert_to_int(op2, op2_copy, result);
1511+
zendi_convert_to_long(op2, op2_copy, result);
15121512
} else {
15131513
op1_lval = Z_LVAL_P(op1);
15141514
}

‎Zend/zend_operators.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ ZEND_API int decrement_function(zval *op2);
333333
ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC);
334334
ZEND_API void _convert_to_cstring(zval *op ZEND_FILE_LINE_DC);
335335
ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC);
336-
ZEND_API void convert_to_int(zval *op);
336+
ZEND_API void convert_to_long(zval *op);
337337
ZEND_API void convert_to_double(zval *op);
338-
ZEND_API void convert_to_int_base(zval *op, int base);
338+
ZEND_API void convert_to_long_base(zval *op, int base);
339339
ZEND_API void convert_to_null(zval *op);
340340
ZEND_API void convert_to_boolean(zval *op);
341341
ZEND_API void convert_to_array(zval *op);
342342
ZEND_API void convert_to_object(zval *op);
343-
ZEND_API void multi_convert_to_int_ex(int argc, ...);
343+
ZEND_API void multi_convert_to_long_ex(int argc, ...);
344344
ZEND_API void multi_convert_to_double_ex(int argc, ...);
345345
ZEND_API void multi_convert_to_string_ex(int argc, ...);
346346

@@ -418,7 +418,7 @@ END_EXTERN_C()
418418
convert_to_null(pzv); \
419419
break; \
420420
case IS_LONG: \
421-
convert_to_int(pzv); \
421+
convert_to_long(pzv); \
422422
break; \
423423
case IS_DOUBLE: \
424424
convert_to_double(pzv); \
@@ -448,7 +448,7 @@ END_EXTERN_C()
448448
}
449449

450450
#define convert_to_boolean_ex(pzv) convert_to_ex_master(pzv, boolean, _IS_BOOL)
451-
#define convert_to_int_ex(pzv) convert_to_ex_master(pzv, int, IS_LONG)
451+
#define convert_to_long_ex(pzv) convert_to_ex_master(pzv, int, IS_LONG)
452452
#define convert_to_double_ex(pzv) convert_to_ex_master(pzv, double, IS_DOUBLE)
453453
#define convert_to_string_ex(pzv) convert_to_ex_master(pzv, string, IS_STRING)
454454
#define convert_to_array_ex(pzv) convert_to_ex_master(pzv, array, IS_ARRAY)

‎Zend/zend_vm_def.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4956,7 +4956,7 @@ ZEND_VM_C_LABEL(num_index_prop):
49564956
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
49574957
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
49584958
ZVAL_DUP(&tmp, offset);
4959-
convert_to_int(&tmp);
4959+
convert_to_long(&tmp);
49604960
offset = &tmp;
49614961
}
49624962
}

‎Zend/zend_vm_execute.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -16772,7 +16772,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND
1677216772
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
1677316773
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
1677416774
ZVAL_DUP(&tmp, offset);
16775-
convert_to_int(&tmp);
16775+
convert_to_long(&tmp);
1677616776
offset = &tmp;
1677716777
}
1677816778
}
@@ -18759,7 +18759,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_O
1875918759
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
1876018760
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
1876118761
ZVAL_DUP(&tmp, offset);
18762-
convert_to_int(&tmp);
18762+
convert_to_long(&tmp);
1876318763
offset = &tmp;
1876418764
}
1876518765
}
@@ -21117,7 +21117,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_O
2111721117
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
2111821118
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
2111921119
ZVAL_DUP(&tmp, offset);
21120-
convert_to_int(&tmp);
21120+
convert_to_long(&tmp);
2112121121
offset = &tmp;
2112221122
}
2112321123
}
@@ -24348,7 +24348,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OP
2434824348
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
2434924349
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
2435024350
ZVAL_DUP(&tmp, offset);
24351-
convert_to_int(&tmp);
24351+
convert_to_long(&tmp);
2435224352
offset = &tmp;
2435324353
}
2435424354
}
@@ -25809,7 +25809,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(Z
2580925809
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
2581025810
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
2581125811
ZVAL_DUP(&tmp, offset);
25812-
convert_to_int(&tmp);
25812+
convert_to_long(&tmp);
2581325813
offset = &tmp;
2581425814
}
2581525815
}
@@ -27089,7 +27089,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEN
2708927089
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
2709027090
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
2709127091
ZVAL_DUP(&tmp, offset);
27092-
convert_to_int(&tmp);
27092+
convert_to_long(&tmp);
2709327093
offset = &tmp;
2709427094
}
2709527095
}
@@ -28371,7 +28371,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEN
2837128371
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
2837228372
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
2837328373
ZVAL_DUP(&tmp, offset);
28374-
convert_to_int(&tmp);
28374+
convert_to_long(&tmp);
2837528375
offset = &tmp;
2837628376
}
2837728377
}
@@ -30162,7 +30162,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND
3016230162
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
3016330163
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
3016430164
ZVAL_DUP(&tmp, offset);
30165-
convert_to_int(&tmp);
30165+
convert_to_long(&tmp);
3016630166
offset = &tmp;
3016730167
}
3016830168
}
@@ -33770,7 +33770,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_
3377033770
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
3377133771
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
3377233772
ZVAL_DUP(&tmp, offset);
33773-
convert_to_int(&tmp);
33773+
convert_to_long(&tmp);
3377433774
offset = &tmp;
3377533775
}
3377633776
}
@@ -35668,7 +35668,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OP
3566835668
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
3566935669
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
3567035670
ZVAL_DUP(&tmp, offset);
35671-
convert_to_int(&tmp);
35671+
convert_to_long(&tmp);
3567235672
offset = &tmp;
3567335673
}
3567435674
}
@@ -37906,7 +37906,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OP
3790637906
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
3790737907
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
3790837908
ZVAL_DUP(&tmp, offset);
37909-
convert_to_int(&tmp);
37909+
convert_to_long(&tmp);
3791037910
offset = &tmp;
3791137911
}
3791237912
}
@@ -40881,7 +40881,7 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPC
4088140881
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
4088240882
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
4088340883
ZVAL_DUP(&tmp, offset);
40884-
convert_to_int(&tmp);
40884+
convert_to_long(&tmp);
4088540885
offset = &tmp;
4088640886
}
4088740887
}

‎ext/bz2/bz2_filter.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static php_stream_filter *php_bz2_filter_create(const char *filtername, zval *fi
380380
zval tmp;
381381

382382
ZVAL_DUP(&tmp, tmpzval);
383-
convert_to_int(&tmp);
383+
convert_to_long(&tmp);
384384
if (Z_LVAL(tmp) < 1 || Z_LVAL(tmp) > 9) {
385385
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter given for number of blocks to allocate. (%pd)", Z_LVAL_P(tmpzval));
386386
} else {
@@ -393,7 +393,7 @@ static php_stream_filter *php_bz2_filter_create(const char *filtername, zval *fi
393393
zval tmp;
394394

395395
ZVAL_DUP(&tmp, tmpzval);
396-
convert_to_int(&tmp);
396+
convert_to_long(&tmp);
397397

398398
if (Z_LVAL(tmp) < 0 || Z_LVAL(tmp) > 250) {
399399
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter given for work factor. (%pd)", Z_LVAL(tmp));

‎ext/com_dotnet/com_com.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ PHP_FUNCTION(com_create_instance)
108108

109109
if (NULL != (tmp = zend_hash_str_find(HASH_OF(server_params),
110110
"Flags", sizeof("Flags")-1))) {
111-
convert_to_int_ex(tmp);
111+
convert_to_long_ex(tmp);
112112
ctx = (CLSCTX)Z_LVAL_P(tmp);
113113
}
114114
}

0 commit comments

Comments
 (0)