Skip to content

Commit 63d3f0b

Browse files
weltlingweltling
committed
basic macro replacements, all at once
1 parent 1e82739 commit 63d3f0b

File tree

230 files changed

+4431
-4431
lines changed

Some content is hidden

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

230 files changed

+4431
-4431
lines changed

‎ext/bcmath/bcmath.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ PHP_FUNCTION(bccomp)
525525

526526
bc_str2num(&first, left, scale TSRMLS_CC);
527527
bc_str2num(&second, right, scale TSRMLS_CC);
528-
RETVAL_LONG(bc_compare(first, second));
528+
RETVAL_INT(bc_compare(first, second));
529529

530530
bc_free_num(&first);
531531
bc_free_num(&second);

‎ext/bz2/bz2.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ static PHP_FUNCTION(bzopen)
393393

394394
/* If it's not a resource its a string containing the filename to open */
395395
if (Z_TYPE_P(file) == IS_STRING) {
396-
if (Z_STRLEN_P(file) == 0) {
396+
if (Z_STRSIZE_P(file) == 0) {
397397
php_error_docref(NULL TSRMLS_CC, E_WARNING, "filename cannot be empty");
398398
RETURN_FALSE;
399399
}
@@ -527,7 +527,7 @@ static PHP_FUNCTION(bzcompress)
527527
error = BZ2_bzBuffToBuffCompress(dest->val, &dest_len, source, source_len, block_size, 0, work_factor);
528528
if (error != BZ_OK) {
529529
STR_FREE(dest);
530-
RETURN_LONG(error);
530+
RETURN_INT(error);
531531
} else {
532532
/* Copy the buffer, we have perhaps allocate a lot more than we need,
533533
so we erealloc() the buffer to the proper size */
@@ -586,7 +586,7 @@ static PHP_FUNCTION(bzdecompress)
586586
efree(dest);
587587
} else { /* real error */
588588
efree(dest);
589-
RETVAL_LONG(error);
589+
RETVAL_INT(error);
590590
}
591591

592592
BZ2_bzDecompressEnd(&bzs);
@@ -621,15 +621,15 @@ static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int opt)
621621
/* Determine what to return */
622622
switch (opt) {
623623
case PHP_BZ_ERRNO:
624-
RETURN_LONG(errnum);
624+
RETURN_INT(errnum);
625625
break;
626626
case PHP_BZ_ERRSTR:
627627
RETURN_STRING((char*)errstr);
628628
break;
629629
case PHP_BZ_ERRBOTH:
630630
array_init(return_value);
631631

632-
add_assoc_long (return_value, "errno", errnum);
632+
add_assoc_int (return_value, "errno", errnum);
633633
add_assoc_string(return_value, "errstr", (char*)errstr);
634634
break;
635635
}

‎ext/bz2/bz2_filter.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -380,11 +380,11 @@ 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_long(&tmp);
384-
if (Z_LVAL(tmp) < 1 || Z_LVAL(tmp) > 9) {
385-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter given for number of blocks to allocate. (%ld)", Z_LVAL_P(tmpzval));
383+
convert_to_int(&tmp);
384+
if (Z_IVAL(tmp) < 1 || Z_IVAL(tmp) > 9) {
385+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter given for number of blocks to allocate. (%ld)", Z_IVAL_P(tmpzval));
386386
} else {
387-
blockSize100k = Z_LVAL(tmp);
387+
blockSize100k = Z_IVAL(tmp);
388388
}
389389
}
390390

@@ -393,12 +393,12 @@ 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_long(&tmp);
396+
convert_to_int(&tmp);
397397

398-
if (Z_LVAL(tmp) < 0 || Z_LVAL(tmp) > 250) {
399-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter given for work factor. (%ld)", Z_LVAL(tmp));
398+
if (Z_IVAL(tmp) < 0 || Z_IVAL(tmp) > 250) {
399+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter given for work factor. (%ld)", Z_IVAL(tmp));
400400
} else {
401-
workFactor = Z_LVAL(tmp);
401+
workFactor = Z_IVAL(tmp);
402402
}
403403
}
404404
}

‎ext/calendar/cal_unix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ PHP_FUNCTION(unixtojd)
4545
RETURN_FALSE;
4646
}
4747

48-
RETURN_LONG(GregorianToSdn(ta->tm_year+1900, ta->tm_mon+1, ta->tm_mday));
48+
RETURN_INT(GregorianToSdn(ta->tm_year+1900, ta->tm_mon+1, ta->tm_mday));
4949
}
5050
/* }}} */
5151

@@ -64,7 +64,7 @@ PHP_FUNCTION(jdtounix)
6464
RETURN_FALSE;
6565
}
6666

67-
RETURN_LONG(uday * 24 * 3600);
67+
RETURN_INT(uday * 24 * 3600);
6868
}
6969
/* }}} */
7070

‎ext/calendar/calendar.c

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -225,31 +225,31 @@ enum { CAL_MONTH_GREGORIAN_SHORT, CAL_MONTH_GREGORIAN_LONG,
225225

226226
PHP_MINIT_FUNCTION(calendar)
227227
{
228-
REGISTER_LONG_CONSTANT("CAL_GREGORIAN", CAL_GREGORIAN, CONST_CS | CONST_PERSISTENT);
229-
REGISTER_LONG_CONSTANT("CAL_JULIAN", CAL_JULIAN, CONST_CS | CONST_PERSISTENT);
230-
REGISTER_LONG_CONSTANT("CAL_JEWISH", CAL_JEWISH, CONST_CS | CONST_PERSISTENT);
231-
REGISTER_LONG_CONSTANT("CAL_FRENCH", CAL_FRENCH, CONST_CS | CONST_PERSISTENT);
232-
REGISTER_LONG_CONSTANT("CAL_NUM_CALS", CAL_NUM_CALS, CONST_CS | CONST_PERSISTENT);
228+
REGISTER_INT_CONSTANT("CAL_GREGORIAN", CAL_GREGORIAN, CONST_CS | CONST_PERSISTENT);
229+
REGISTER_INT_CONSTANT("CAL_JULIAN", CAL_JULIAN, CONST_CS | CONST_PERSISTENT);
230+
REGISTER_INT_CONSTANT("CAL_JEWISH", CAL_JEWISH, CONST_CS | CONST_PERSISTENT);
231+
REGISTER_INT_CONSTANT("CAL_FRENCH", CAL_FRENCH, CONST_CS | CONST_PERSISTENT);
232+
REGISTER_INT_CONSTANT("CAL_NUM_CALS", CAL_NUM_CALS, CONST_CS | CONST_PERSISTENT);
233233
/* constants for jddayofweek */
234-
REGISTER_LONG_CONSTANT("CAL_DOW_DAYNO", CAL_DOW_DAYNO, CONST_CS | CONST_PERSISTENT);
235-
REGISTER_LONG_CONSTANT("CAL_DOW_SHORT", CAL_DOW_SHORT, CONST_CS | CONST_PERSISTENT);
236-
REGISTER_LONG_CONSTANT("CAL_DOW_LONG", CAL_DOW_LONG, CONST_CS | CONST_PERSISTENT);
234+
REGISTER_INT_CONSTANT("CAL_DOW_DAYNO", CAL_DOW_DAYNO, CONST_CS | CONST_PERSISTENT);
235+
REGISTER_INT_CONSTANT("CAL_DOW_SHORT", CAL_DOW_SHORT, CONST_CS | CONST_PERSISTENT);
236+
REGISTER_INT_CONSTANT("CAL_DOW_LONG", CAL_DOW_LONG, CONST_CS | CONST_PERSISTENT);
237237
/* constants for jdmonthname */
238-
REGISTER_LONG_CONSTANT("CAL_MONTH_GREGORIAN_SHORT", CAL_MONTH_GREGORIAN_SHORT, CONST_CS | CONST_PERSISTENT);
239-
REGISTER_LONG_CONSTANT("CAL_MONTH_GREGORIAN_LONG", CAL_MONTH_GREGORIAN_LONG, CONST_CS | CONST_PERSISTENT);
240-
REGISTER_LONG_CONSTANT("CAL_MONTH_JULIAN_SHORT", CAL_MONTH_JULIAN_SHORT, CONST_CS | CONST_PERSISTENT);
241-
REGISTER_LONG_CONSTANT("CAL_MONTH_JULIAN_LONG", CAL_MONTH_JULIAN_LONG, CONST_CS | CONST_PERSISTENT);
242-
REGISTER_LONG_CONSTANT("CAL_MONTH_JEWISH", CAL_MONTH_JEWISH, CONST_CS | CONST_PERSISTENT);
243-
REGISTER_LONG_CONSTANT("CAL_MONTH_FRENCH", CAL_MONTH_FRENCH, CONST_CS | CONST_PERSISTENT);
238+
REGISTER_INT_CONSTANT("CAL_MONTH_GREGORIAN_SHORT", CAL_MONTH_GREGORIAN_SHORT, CONST_CS | CONST_PERSISTENT);
239+
REGISTER_INT_CONSTANT("CAL_MONTH_GREGORIAN_LONG", CAL_MONTH_GREGORIAN_LONG, CONST_CS | CONST_PERSISTENT);
240+
REGISTER_INT_CONSTANT("CAL_MONTH_JULIAN_SHORT", CAL_MONTH_JULIAN_SHORT, CONST_CS | CONST_PERSISTENT);
241+
REGISTER_INT_CONSTANT("CAL_MONTH_JULIAN_LONG", CAL_MONTH_JULIAN_LONG, CONST_CS | CONST_PERSISTENT);
242+
REGISTER_INT_CONSTANT("CAL_MONTH_JEWISH", CAL_MONTH_JEWISH, CONST_CS | CONST_PERSISTENT);
243+
REGISTER_INT_CONSTANT("CAL_MONTH_FRENCH", CAL_MONTH_FRENCH, CONST_CS | CONST_PERSISTENT);
244244
/* constants for easter calculation */
245-
REGISTER_LONG_CONSTANT("CAL_EASTER_DEFAULT", CAL_EASTER_DEFAULT, CONST_CS | CONST_PERSISTENT);
246-
REGISTER_LONG_CONSTANT("CAL_EASTER_ROMAN", CAL_EASTER_ROMAN, CONST_CS | CONST_PERSISTENT);
247-
REGISTER_LONG_CONSTANT("CAL_EASTER_ALWAYS_GREGORIAN", CAL_EASTER_ALWAYS_GREGORIAN, CONST_CS | CONST_PERSISTENT);
248-
REGISTER_LONG_CONSTANT("CAL_EASTER_ALWAYS_JULIAN", CAL_EASTER_ALWAYS_JULIAN, CONST_CS | CONST_PERSISTENT);
245+
REGISTER_INT_CONSTANT("CAL_EASTER_DEFAULT", CAL_EASTER_DEFAULT, CONST_CS | CONST_PERSISTENT);
246+
REGISTER_INT_CONSTANT("CAL_EASTER_ROMAN", CAL_EASTER_ROMAN, CONST_CS | CONST_PERSISTENT);
247+
REGISTER_INT_CONSTANT("CAL_EASTER_ALWAYS_GREGORIAN", CAL_EASTER_ALWAYS_GREGORIAN, CONST_CS | CONST_PERSISTENT);
248+
REGISTER_INT_CONSTANT("CAL_EASTER_ALWAYS_JULIAN", CAL_EASTER_ALWAYS_JULIAN, CONST_CS | CONST_PERSISTENT);
249249
/* constants for Jewish date formatting */
250-
REGISTER_LONG_CONSTANT("CAL_JEWISH_ADD_ALAFIM_GERESH", CAL_JEWISH_ADD_ALAFIM_GERESH, CONST_CS | CONST_PERSISTENT);
251-
REGISTER_LONG_CONSTANT("CAL_JEWISH_ADD_ALAFIM", CAL_JEWISH_ADD_ALAFIM, CONST_CS | CONST_PERSISTENT);
252-
REGISTER_LONG_CONSTANT("CAL_JEWISH_ADD_GERESHAYIM", CAL_JEWISH_ADD_GERESHAYIM, CONST_CS | CONST_PERSISTENT);
250+
REGISTER_INT_CONSTANT("CAL_JEWISH_ADD_ALAFIM_GERESH", CAL_JEWISH_ADD_ALAFIM_GERESH, CONST_CS | CONST_PERSISTENT);
251+
REGISTER_INT_CONSTANT("CAL_JEWISH_ADD_ALAFIM", CAL_JEWISH_ADD_ALAFIM, CONST_CS | CONST_PERSISTENT);
252+
REGISTER_INT_CONSTANT("CAL_JEWISH_ADD_GERESHAYIM", CAL_JEWISH_ADD_GERESHAYIM, CONST_CS | CONST_PERSISTENT);
253253
return SUCCESS;
254254
}
255255

@@ -279,7 +279,7 @@ static void _php_cal_info(int cal, zval *ret)
279279

280280
add_assoc_zval(ret, "months", &months);
281281
add_assoc_zval(ret, "abbrevmonths", &smonths);
282-
add_assoc_long(ret, "maxdaysinmonth", calendar->max_days_in_month);
282+
add_assoc_int(ret, "maxdaysinmonth", calendar->max_days_in_month);
283283
add_assoc_string(ret, "calname", calendar->name);
284284
add_assoc_string(ret, "calsymbol", calendar->symbol);
285285

@@ -360,7 +360,7 @@ PHP_FUNCTION(cal_days_in_month)
360360
}
361361
}
362362

363-
RETURN_LONG(sdn_next - sdn_start);
363+
RETURN_INT(sdn_next - sdn_start);
364364
}
365365
/* }}} */
366366

@@ -379,7 +379,7 @@ PHP_FUNCTION(cal_to_jd)
379379
RETURN_FALSE;
380380
}
381381

382-
RETURN_LONG(cal_conversion_table[cal].to_jd(year, month, day));
382+
RETURN_INT(cal_conversion_table[cal].to_jd(year, month, day));
383383
}
384384
/* }}} */
385385

@@ -409,13 +409,13 @@ PHP_FUNCTION(cal_from_jd)
409409
snprintf(date, sizeof(date), "%i/%i/%i", month, day, year);
410410
add_assoc_string(return_value, "date", date);
411411

412-
add_assoc_long(return_value, "month", month);
413-
add_assoc_long(return_value, "day", day);
414-
add_assoc_long(return_value, "year", year);
412+
add_assoc_int(return_value, "month", month);
413+
add_assoc_int(return_value, "day", day);
414+
add_assoc_int(return_value, "year", year);
415415

416416
/* day of week */
417417
dow = DayOfWeek(jd);
418-
add_assoc_long(return_value, "dow", dow);
418+
add_assoc_int(return_value, "dow", dow);
419419
add_assoc_string(return_value, "abbrevdayname", DayNameShort[dow]);
420420
add_assoc_string(return_value, "dayname", DayNameLong[dow]);
421421
/* month name */
@@ -459,7 +459,7 @@ PHP_FUNCTION(gregoriantojd)
459459
RETURN_FALSE;
460460
}
461461

462-
RETURN_LONG(GregorianToSdn(year, month, day));
462+
RETURN_INT(GregorianToSdn(year, month, day));
463463
}
464464
/* }}} */
465465

@@ -492,7 +492,7 @@ PHP_FUNCTION(juliantojd)
492492
RETURN_FALSE;
493493
}
494494

495-
RETURN_LONG(JulianToSdn(year, month, day));
495+
RETURN_INT(JulianToSdn(year, month, day));
496496
}
497497
/* }}} */
498498

@@ -640,7 +640,7 @@ PHP_FUNCTION(jewishtojd)
640640
RETURN_FALSE;
641641
}
642642

643-
RETURN_LONG(JewishToSdn(year, month, day));
643+
RETURN_INT(JewishToSdn(year, month, day));
644644
}
645645
/* }}} */
646646

@@ -673,7 +673,7 @@ PHP_FUNCTION(frenchtojd)
673673
RETURN_FALSE;
674674
}
675675

676-
RETURN_LONG(FrenchToSdn(year, month, day));
676+
RETURN_INT(FrenchToSdn(year, month, day));
677677
}
678678
/* }}} */
679679

@@ -702,7 +702,7 @@ PHP_FUNCTION(jddayofweek)
702702
break;
703703
case CAL_DOW_DAYNO:
704704
default:
705-
RETURN_LONG(day);
705+
RETURN_INT(day);
706706
break;
707707
}
708708
}

‎ext/calendar/easter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, int gm)
115115
} else { /* return the days after March 21 */
116116
result = easter;
117117
}
118-
ZVAL_LONG(return_value, result);
118+
ZVAL_INT(return_value, result);
119119
}
120120

121121
/* {{{ proto int easter_date([int year])

‎ext/com_dotnet/com_com.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,35 +81,35 @@ PHP_FUNCTION(com_create_instance)
8181
"Server", sizeof("Server")-1))) {
8282
convert_to_string_ex(tmp);
8383
server_name = Z_STRVAL_P(tmp);
84-
server_name_len = Z_STRLEN_P(tmp);
84+
server_name_len = Z_STRSIZE_P(tmp);
8585
ctx = CLSCTX_REMOTE_SERVER;
8686
}
8787

8888
if (NULL != (tmp = zend_hash_str_find(HASH_OF(server_params),
8989
"Username", sizeof("Username")-1))) {
9090
convert_to_string_ex(tmp);
9191
user_name = Z_STRVAL_P(tmp);
92-
user_name_len = Z_STRLEN_P(tmp);
92+
user_name_len = Z_STRSIZE_P(tmp);
9393
}
9494

9595
if (NULL != (tmp = zend_hash_str_find(HASH_OF(server_params),
9696
"Password", sizeof("Password")-1))) {
9797
convert_to_string_ex(tmp);
9898
password = Z_STRVAL_P(tmp);
99-
password_len = Z_STRLEN_P(tmp);
99+
password_len = Z_STRSIZE_P(tmp);
100100
}
101101

102102
if (NULL != (tmp = zend_hash_str_find(HASH_OF(server_params),
103103
"Domain", sizeof("Domain")-1))) {
104104
convert_to_string_ex(tmp);
105105
domain_name = Z_STRVAL_P(tmp);
106-
domain_name_len = Z_STRLEN_P(tmp);
106+
domain_name_len = Z_STRSIZE_P(tmp);
107107
}
108108

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

@@ -427,7 +427,7 @@ HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, char *name,
427427
}
428428

429429
if (obj->id_of_name_cache && NULL != (tmp = zend_hash_str_find(obj->id_of_name_cache, name, namelen))) {
430-
*dispid = Z_LVAL_P(tmp);
430+
*dispid = Z_IVAL_P(tmp);
431431
return S_OK;
432432
}
433433

@@ -456,7 +456,7 @@ HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, char *name,
456456
ALLOC_HASHTABLE(obj->id_of_name_cache);
457457
zend_hash_init(obj->id_of_name_cache, 2, NULL, NULL, 0);
458458
}
459-
ZVAL_LONG(&tmp, *dispid);
459+
ZVAL_INT(&tmp, *dispid);
460460
zend_hash_str_update(obj->id_of_name_cache, name, namelen, &tmp);
461461
}
462462

‎ext/com_dotnet/com_extension.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ PHP_MINIT_FUNCTION(com_dotnet)
381381

382382
REGISTER_INI_ENTRIES();
383383

384-
#define COM_CONST(x) REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT)
384+
#define COM_CONST(x) REGISTER_INT_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT)
385385

386386
COM_CONST(CLSCTX_INPROC_SERVER);
387387
COM_CONST(CLSCTX_INPROC_HANDLER);

‎ext/com_dotnet/com_handlers.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static zval *com_property_read(zval *object, zval *member, int type, void **cahc
4444

4545
convert_to_string_ex(member);
4646

47-
res = php_com_do_invoke(obj, Z_STRVAL_P(member), Z_STRLEN_P(member),
47+
res = php_com_do_invoke(obj, Z_STRVAL_P(member), Z_STRSIZE_P(member),
4848
DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v, 0, NULL, 1 TSRMLS_CC);
4949

5050
if (res == SUCCESS) {
@@ -71,7 +71,7 @@ static void com_property_write(zval *object, zval *member, zval *value, void **c
7171
VariantInit(&v);
7272

7373
convert_to_string_ex(member);
74-
if (SUCCESS == php_com_do_invoke(obj, Z_STRVAL_P(member), Z_STRLEN_P(member),
74+
if (SUCCESS == php_com_do_invoke(obj, Z_STRVAL_P(member), Z_STRSIZE_P(member),
7575
DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &v, 1, value, 0 TSRMLS_CC)) {
7676
VariantClear(&v);
7777
}
@@ -98,10 +98,10 @@ static zval *com_read_dimension(zval *object, zval *offset, int type, zval *rv T
9898
VariantClear(&v);
9999
}
100100
} else if (V_ISARRAY(&obj->v)) {
101-
convert_to_long(offset);
101+
convert_to_int(offset);
102102

103103
if (SafeArrayGetDim(V_ARRAY(&obj->v)) == 1) {
104-
if (php_com_safearray_get_elem(&obj->v, &v, Z_LVAL_P(offset) TSRMLS_CC)) {
104+
if (php_com_safearray_get_elem(&obj->v, &v, Z_IVAL_P(offset) TSRMLS_CC)) {
105105
php_com_wrap_variant(rv, &v, obj->code_page TSRMLS_CC);
106106
VariantClear(&v);
107107
}
@@ -144,8 +144,8 @@ static void com_write_dimension(zval *object, zval *offset, zval *value TSRMLS_D
144144
vt = V_VT(&obj->v) & ~VT_ARRAY;
145145
}
146146

147-
convert_to_long(offset);
148-
indices = Z_LVAL_P(offset);
147+
convert_to_int(offset);
148+
indices = Z_IVAL_P(offset);
149149

150150
VariantInit(&v);
151151
php_com_variant_from_zval(&v, value, obj->code_page TSRMLS_CC);
@@ -197,7 +197,7 @@ static int com_property_exists(zval *object, zval *member, int check_empty, void
197197

198198
if (V_VT(&obj->v) == VT_DISPATCH) {
199199
convert_to_string_ex(member);
200-
if (SUCCEEDED(php_com_get_id_of_name(obj, Z_STRVAL_P(member), Z_STRLEN_P(member), &dispid TSRMLS_CC))) {
200+
if (SUCCEEDED(php_com_get_id_of_name(obj, Z_STRVAL_P(member), Z_STRSIZE_P(member), &dispid TSRMLS_CC))) {
201201
/* TODO: distinguish between property and method! */
202202
return 1;
203203
}
@@ -491,7 +491,7 @@ static int com_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
491491
}
492492

493493
switch(type) {
494-
case IS_LONG:
494+
case IS_INT:
495495
vt = VT_INT;
496496
break;
497497
case IS_DOUBLE:

‎ext/com_dotnet/com_iterator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static void com_iter_get_key(zend_object_iterator *iter, zval *key TSRMLS_DC)
7878
if (I->key == (ulong)-1) {
7979
ZVAL_NULL(key);
8080
} else {
81-
ZVAL_LONG(key, I->key);
81+
ZVAL_INT(key, I->key);
8282
}
8383
}
8484

0 commit comments

Comments
 (0)