Standardized usage of zpp_none and the order of the comparison zpp(...) == FAILURE

diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index 273bc7506aa74dea894333ad38ece4d646494c80..d5a9f83ae14110ce826c00bf04addea31f043d71 100644 (file)
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -603,7 +603,7 @@ SPL_METHOD(SplDoublyLinkedList, pop)
        zval *value;
        spl_dllist_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -626,7 +626,7 @@ SPL_METHOD(SplDoublyLinkedList, shift)
        zval *value;
        spl_dllist_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -649,7 +649,7 @@ SPL_METHOD(SplDoublyLinkedList, top)
        zval *value;
        spl_dllist_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -672,7 +672,7 @@ SPL_METHOD(SplDoublyLinkedList, bottom)
        zval *value;
        spl_dllist_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -695,7 +695,7 @@ SPL_METHOD(SplDoublyLinkedList, count)
        long count;
        spl_dllist_object *intern = (spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -710,7 +710,7 @@ SPL_METHOD(SplDoublyLinkedList, isEmpty)
 {
        long count;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -750,7 +750,7 @@ SPL_METHOD(SplDoublyLinkedList, getIteratorMode)
 {
        spl_dllist_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 

diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index 86a5371ed30d3c29d1bd692d4253bb138ec4d9ce..8624b35a4b616b11cbd6589968ada6750fdb894d 100644 (file)
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -583,7 +583,7 @@ SPL_METHOD(SplFixedArray, __construct)
        spl_fixedarray_object *intern;
        long size = 0;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &size)) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &size) == FAILURE) {
                return;
        }
 
@@ -613,7 +613,7 @@ SPL_METHOD(SplFixedArray, __wakeup)
        HashTable *intern_ht = zend_std_get_properties(getThis() TSRMLS_CC);
        zval **data;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -643,7 +643,7 @@ SPL_METHOD(SplFixedArray, count)
        zval *object = getThis();
        spl_fixedarray_object *intern;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -661,7 +661,7 @@ SPL_METHOD(SplFixedArray, toArray)
 {
        spl_fixedarray_object *intern;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -693,7 +693,7 @@ SPL_METHOD(SplFixedArray, fromArray)
        int num;
        zend_bool save_indexes = 1;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &data, &save_indexes)) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &data, &save_indexes) == FAILURE) {
                return;
        }
 
@@ -777,7 +777,7 @@ SPL_METHOD(SplFixedArray, getSize)
        zval *object = getThis();
        spl_fixedarray_object *intern;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -797,7 +797,7 @@ SPL_METHOD(SplFixedArray, setSize)
        spl_fixedarray_object *intern;
        long size;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &size)) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &size) == FAILURE) {
                return;
        }
 

diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index cb1f68dcf1196f3ac989753fc1435840f0ed8e1d..77b31c06dcdc7eb5d3093e201b7c3b559b8f0d75 100644 (file)
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -587,7 +587,7 @@ SPL_METHOD(SplHeap, count)
        long count;
        spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -602,7 +602,7 @@ SPL_METHOD(SplHeap, isEmpty)
 {
        spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -643,7 +643,7 @@ SPL_METHOD(SplHeap, extract)
        zval *value;
        spl_heap_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -705,7 +705,7 @@ SPL_METHOD(SplPriorityQueue, extract)
        zval *value, *value_out, **value_out_pp;
        spl_heap_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -748,7 +748,7 @@ SPL_METHOD(SplPriorityQueue, top)
        zval *value, **value_out;
        spl_heap_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -802,7 +802,7 @@ SPL_METHOD(SplHeap, recoverFromCorruption)
 {
        spl_heap_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }
 
@@ -835,7 +835,7 @@ SPL_METHOD(SplHeap, top)
        zval *value;
        spl_heap_object *intern;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+       if (zend_parse_parameters_none() == FAILURE) {
                return;
        }