Skip to content

Commit 3f19f51

Browse files
committed
Add RETURN_EMPTY_ARRAY() / RETVAL_EMPTY_ARRAY()
The usual wrappers around ZVAL_EMPTY_ARRAY()...
1 parent 7bc4bd0 commit 3f19f51

File tree

9 files changed

+27
-37
lines changed

9 files changed

+27
-37
lines changed

Zend/zend_API.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ END_EXTERN_C()
614614
#define RETVAL_EMPTY_STRING() ZVAL_EMPTY_STRING(return_value)
615615
#define RETVAL_RES(r) ZVAL_RES(return_value, r)
616616
#define RETVAL_ARR(r) ZVAL_ARR(return_value, r)
617+
#define RETVAL_EMPTY_ARRAY(r) ZVAL_EMPTY_ARRAY(return_value)
617618
#define RETVAL_OBJ(r) ZVAL_OBJ(return_value, r)
618619
#define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor)
619620
#define RETVAL_FALSE ZVAL_FALSE(return_value)
@@ -632,6 +633,7 @@ END_EXTERN_C()
632633
#define RETURN_EMPTY_STRING() { RETVAL_EMPTY_STRING(); return; }
633634
#define RETURN_RES(r) { RETVAL_RES(r); return; }
634635
#define RETURN_ARR(r) { RETVAL_ARR(r); return; }
636+
#define RETURN_EMPTY_ARRAY(r) { RETVAL_EMPTY_ARRAY(r); return; }
635637
#define RETURN_OBJ(r) { RETVAL_OBJ(r); return; }
636638
#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; }
637639
#define RETURN_FALSE { RETVAL_FALSE; return; }

Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ ZEND_FUNCTION(func_get_args)
566566
} ZEND_HASH_FILL_END();
567567
Z_ARRVAL_P(return_value)->nNumOfElements = arg_count;
568568
} else {
569-
ZVAL_EMPTY_ARRAY(return_value);
569+
RETURN_EMPTY_ARRAY();
570570
}
571571
}
572572
/* }}} */

ext/libxml/libxml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ static PHP_FUNCTION(libxml_get_errors)
10601060
error = zend_llist_get_next(LIBXML(error_list));
10611061
}
10621062
} else {
1063-
ZVAL_EMPTY_ARRAY(return_value);
1063+
RETURN_EMPTY_ARRAY();
10641064
}
10651065
}
10661066
/* }}} */

ext/mysqli/mysqli_nonapi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ PHP_FUNCTION(mysqli_error_list)
422422
add_next_index_zval(return_value, &single_error);
423423
}
424424
} else {
425-
ZVAL_EMPTY_ARRAY(return_value);
425+
RETURN_EMPTY_ARRAY();
426426
}
427427
#else
428428
if (mysql_errno(mysql->mysql)) {
@@ -434,7 +434,7 @@ PHP_FUNCTION(mysqli_error_list)
434434
add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, mysql_error(mysql->mysql));
435435
add_next_index_zval(return_value, &single_error);
436436
} else {
437-
ZVAL_EMPTY_ARRAY(return_value);
437+
RETURN_EMPTY_ARRAY();
438438
}
439439
#endif
440440
}
@@ -468,7 +468,7 @@ PHP_FUNCTION(mysqli_stmt_error_list)
468468
add_next_index_zval(return_value, &single_error);
469469
}
470470
} else {
471-
ZVAL_EMPTY_ARRAY(return_value);
471+
RETURN_EMPTY_ARRAY();
472472
}
473473
#else
474474
if (mysql_stmt_errno(stmt->stmt)) {
@@ -480,7 +480,7 @@ PHP_FUNCTION(mysqli_stmt_error_list)
480480
add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, mysql_stmt_error(stmt->stmt));
481481
add_next_index_zval(return_value, &single_error);
482482
} else {
483-
ZVAL_EMPTY_ARRAY(return_value);
483+
RETURN_EMPTY_ARRAY();
484484
}
485485
#endif
486486
}

ext/reflection/php_reflection.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ ZEND_METHOD(reflection_function, getStaticVariables)
17891789
} ZEND_HASH_FOREACH_END();
17901790
zend_hash_copy(Z_ARRVAL_P(return_value), ht, zval_add_ref);
17911791
} else {
1792-
ZVAL_EMPTY_ARRAY(return_value);
1792+
RETURN_EMPTY_ARRAY();
17931793
}
17941794
}
17951795
/* }}} */
@@ -1977,8 +1977,7 @@ ZEND_METHOD(reflection_function, getParameters)
19771977
}
19781978

19791979
if (!num_args) {
1980-
ZVAL_EMPTY_ARRAY(return_value);
1981-
return;
1980+
RETURN_EMPTY_ARRAY();
19821981
}
19831982

19841983
array_init(return_value);
@@ -4796,7 +4795,7 @@ ZEND_METHOD(reflection_class, getInterfaces)
47964795
zend_hash_update(Z_ARRVAL_P(return_value), ce->interfaces[i]->name, &interface);
47974796
}
47984797
} else {
4799-
ZVAL_EMPTY_ARRAY(return_value);
4798+
RETURN_EMPTY_ARRAY();
48004799
}
48014800
}
48024801
/* }}} */
@@ -4816,8 +4815,7 @@ ZEND_METHOD(reflection_class, getInterfaceNames)
48164815

48174816
if (!ce->num_interfaces) {
48184817
/* Return an empty array if this class implements no interfaces */
4819-
ZVAL_EMPTY_ARRAY(return_value);
4820-
return;
4818+
RETURN_EMPTY_ARRAY();
48214819
}
48224820

48234821
ZEND_ASSERT(ce->ce_flags & ZEND_ACC_LINKED);
@@ -4843,8 +4841,7 @@ ZEND_METHOD(reflection_class, getTraits)
48434841
GET_REFLECTION_OBJECT_PTR(ce);
48444842

48454843
if (!ce->num_traits) {
4846-
ZVAL_EMPTY_ARRAY(return_value);
4847-
return;
4844+
RETURN_EMPTY_ARRAY();
48484845
}
48494846

48504847
array_init(return_value);
@@ -4876,8 +4873,7 @@ ZEND_METHOD(reflection_class, getTraitNames)
48764873
GET_REFLECTION_OBJECT_PTR(ce);
48774874

48784875
if (!ce->num_traits) {
4879-
ZVAL_EMPTY_ARRAY(return_value);
4880-
return;
4876+
RETURN_EMPTY_ARRAY();
48814877
}
48824878

48834879
array_init(return_value);
@@ -4918,7 +4914,7 @@ ZEND_METHOD(reflection_class, getTraitAliases)
49184914
i++;
49194915
}
49204916
} else {
4921-
ZVAL_EMPTY_ARRAY(return_value);
4917+
RETURN_EMPTY_ARRAY();
49224918
}
49234919
}
49244920
/* }}} */
@@ -5892,8 +5888,7 @@ ZEND_METHOD(reflection_extension, getDependencies)
58925888

58935889
if (!dep)
58945890
{
5895-
ZVAL_EMPTY_ARRAY(return_value);
5896-
return;
5891+
RETURN_EMPTY_ARRAY();
58975892
}
58985893

58995894
array_init(return_value);

ext/simplexml/simplexml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ SXE_METHOD(xpath)
13601360
}
13611361
}
13621362
} else {
1363-
ZVAL_EMPTY_ARRAY(return_value);
1363+
RETVAL_EMPTY_ARRAY();
13641364
}
13651365

13661366
xmlXPathFreeObject(retval);

ext/spl/spl_fixedarray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ SPL_METHOD(SplFixedArray, toArray)
642642
}
643643
}
644644
} else {
645-
ZVAL_EMPTY_ARRAY(return_value);
645+
RETURN_EMPTY_ARRAY();
646646
}
647647
}
648648
/* }}} */

ext/sqlite3/sqlite3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ PHP_METHOD(sqlite3, querySingle)
679679
if (!entire_row) {
680680
RETVAL_NULL();
681681
} else {
682-
ZVAL_EMPTY_ARRAY(return_value);
682+
RETVAL_EMPTY_ARRAY();
683683
}
684684
break;
685685
}

ext/standard/array.c

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2665,8 +2665,7 @@ PHP_FUNCTION(array_fill)
26652665
}
26662666
}
26672667
} else if (EXPECTED(num == 0)) {
2668-
ZVAL_EMPTY_ARRAY(return_value);
2669-
return;
2668+
RETURN_EMPTY_ARRAY();
26702669
} else {
26712670
php_error_docref(NULL, E_WARNING, "Number of elements can't be negative");
26722671
RETURN_FALSE;
@@ -3503,8 +3502,7 @@ PHP_FUNCTION(array_slice)
35033502

35043503
/* Clamp the offset.. */
35053504
if (offset > num_in) {
3506-
ZVAL_EMPTY_ARRAY(return_value);
3507-
return;
3505+
RETURN_EMPTY_ARRAY();
35083506
} else if (offset < 0 && (offset = (num_in + offset)) < 0) {
35093507
offset = 0;
35103508
}
@@ -3517,8 +3515,7 @@ PHP_FUNCTION(array_slice)
35173515
}
35183516

35193517
if (length <= 0) {
3520-
ZVAL_EMPTY_ARRAY(return_value);
3521-
return;
3518+
RETURN_EMPTY_ARRAY();
35223519
}
35233520

35243521
/* Initialize returned array */
@@ -4050,8 +4047,7 @@ PHP_FUNCTION(array_values)
40504047
/* Return empty input as is */
40514048
arrlen = zend_hash_num_elements(arrval);
40524049
if (!arrlen) {
4053-
ZVAL_EMPTY_ARRAY(return_value);
4054-
return;
4050+
RETURN_EMPTY_ARRAY();
40554051
}
40564052

40574053
/* Return vector-like packed arrays as-is */
@@ -5456,8 +5452,7 @@ PHP_FUNCTION(array_diff)
54565452
RETURN_NULL();
54575453
}
54585454
}
5459-
ZVAL_EMPTY_ARRAY(return_value);
5460-
return;
5455+
RETURN_EMPTY_ARRAY();
54615456
} else if (num == 1) {
54625457
int found = 0;
54635458
zend_string *search_str, *tmp_search_str;
@@ -5474,8 +5469,7 @@ PHP_FUNCTION(array_diff)
54745469
RETURN_NULL();
54755470
}
54765471
}
5477-
ZVAL_EMPTY_ARRAY(return_value);
5478-
return;
5472+
RETURN_EMPTY_ARRAY();
54795473
}
54805474

54815475
search_str = zval_get_tmp_string(value, &tmp_search_str);
@@ -5501,7 +5495,7 @@ PHP_FUNCTION(array_diff)
55015495
zend_tmp_string_release(tmp_search_str);
55025496

55035497
if (found) {
5504-
ZVAL_EMPTY_ARRAY(return_value);
5498+
RETVAL_EMPTY_ARRAY();
55055499
} else {
55065500
ZVAL_COPY(return_value, &args[0]);
55075501
}
@@ -6435,8 +6429,7 @@ PHP_FUNCTION(array_combine)
64356429
}
64366430

64376431
if (!num_keys) {
6438-
ZVAL_EMPTY_ARRAY(return_value);
6439-
return;
6432+
RETURN_EMPTY_ARRAY();
64406433
}
64416434

64426435
array_init_size(return_value, num_keys);

0 commit comments

Comments
 (0)