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

morrisonlevi · morrisonlevi · commit 7f3b5b77cca1 · 2013-10-11T10:32:40.000-06:00
diff --git 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
@@ -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
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ SPL_METHOD(SplDoublyLinkedList, pop)`
`603`	`603`	`zval *value;`
`604`	`604`	`spl_dllist_object *intern;`
`605`	`605`
`606`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`606`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`607`	`607`	`return;`
`608`	`608`	`}`
`609`	`609`
`@@ -626,7 +626,7 @@ SPL_METHOD(SplDoublyLinkedList, shift)`
`626`	`626`	`zval *value;`
`627`	`627`	`spl_dllist_object *intern;`
`628`	`628`
`629`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`629`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`630`	`630`	`return;`
`631`	`631`	`}`
`632`	`632`
`@@ -649,7 +649,7 @@ SPL_METHOD(SplDoublyLinkedList, top)`
`649`	`649`	`zval *value;`
`650`	`650`	`spl_dllist_object *intern;`
`651`	`651`
`652`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`652`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`653`	`653`	`return;`
`654`	`654`	`}`
`655`	`655`
`@@ -672,7 +672,7 @@ SPL_METHOD(SplDoublyLinkedList, bottom)`
`672`	`672`	`zval *value;`
`673`	`673`	`spl_dllist_object *intern;`
`674`	`674`
`675`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`675`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`676`	`676`	`return;`
`677`	`677`	`}`
`678`	`678`
`@@ -695,7 +695,7 @@ SPL_METHOD(SplDoublyLinkedList, count)`
`695`	`695`	`long count;`
`696`	`696`	`spl_dllist_object intern = (spl_dllist_object)zend_object_store_get_object(getThis() TSRMLS_CC);`
`697`	`697`
`698`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`698`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`699`	`699`	`return;`
`700`	`700`	`}`
`701`	`701`
`@@ -710,7 +710,7 @@ SPL_METHOD(SplDoublyLinkedList, isEmpty)`
`710`	`710`	`{`
`711`	`711`	`long count;`
`712`	`712`
`713`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`713`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`714`	`714`	`return;`
`715`	`715`	`}`
`716`	`716`
`@@ -750,7 +750,7 @@ SPL_METHOD(SplDoublyLinkedList, getIteratorMode)`
`750`	`750`	`{`
`751`	`751`	`spl_dllist_object *intern;`
`752`	`752`
`753`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`753`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`754`	`754`	`return;`
`755`	`755`	`}`
`756`	`756`
Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ SPL_METHOD(SplFixedArray, __construct)`
`583`	`583`	`spl_fixedarray_object *intern;`
`584`	`584`	`long size = 0;`
`585`	`585`
`586`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|l", &size)) {`
	`586`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|l", &size) == FAILURE) {`
`587`	`587`	`return;`
`588`	`588`	`}`
`589`	`589`
`@@ -613,7 +613,7 @@ SPL_METHOD(SplFixedArray, __wakeup)`
`613`	`613`	`HashTable *intern_ht = zend_std_get_properties(getThis() TSRMLS_CC);`
`614`	`614`	`zval **data;`
`615`	`615`
`616`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {`
	`616`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`617`	`617`	`return;`
`618`	`618`	`}`
`619`	`619`
`@@ -643,7 +643,7 @@ SPL_METHOD(SplFixedArray, count)`
`643`	`643`	`zval *object = getThis();`
`644`	`644`	`spl_fixedarray_object *intern;`
`645`	`645`
`646`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {`
	`646`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`647`	`647`	`return;`
`648`	`648`	`}`
`649`	`649`
`@@ -661,7 +661,7 @@ SPL_METHOD(SplFixedArray, toArray)`
`661`	`661`	`{`
`662`	`662`	`spl_fixedarray_object *intern;`
`663`	`663`
`664`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {`
	`664`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`665`	`665`	`return;`
`666`	`666`	`}`
`667`	`667`
`@@ -693,7 +693,7 @@ SPL_METHOD(SplFixedArray, fromArray)`
`693`	`693`	`int num;`
`694`	`694`	`zend_bool save_indexes = 1;`
`695`	`695`
`696`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a\|b", &data, &save_indexes)) {`
	`696`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a\|b", &data, &save_indexes) == FAILURE) {`
`697`	`697`	`return;`
`698`	`698`	`}`
`699`	`699`
`@@ -777,7 +777,7 @@ SPL_METHOD(SplFixedArray, getSize)`
`777`	`777`	`zval *object = getThis();`
`778`	`778`	`spl_fixedarray_object *intern;`
`779`	`779`
`780`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {`
	`780`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`781`	`781`	`return;`
`782`	`782`	`}`
`783`	`783`
`@@ -797,7 +797,7 @@ SPL_METHOD(SplFixedArray, setSize)`
`797`	`797`	`spl_fixedarray_object *intern;`
`798`	`798`	`long size;`
`799`	`799`
`800`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &size)) {`
	`800`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &size) == FAILURE) {`
`801`	`801`	`return;`
`802`	`802`	`}`
`803`	`803`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ SPL_METHOD(SplHeap, count)`
`587`	`587`	`long count;`
`588`	`588`	`spl_heap_object intern = (spl_heap_object)zend_object_store_get_object(getThis() TSRMLS_CC);`
`589`	`589`
`590`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`590`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`591`	`591`	`return;`
`592`	`592`	`}`
`593`	`593`
`@@ -602,7 +602,7 @@ SPL_METHOD(SplHeap, isEmpty)`
`602`	`602`	`{`
`603`	`603`	`spl_heap_object intern = (spl_heap_object)zend_object_store_get_object(getThis() TSRMLS_CC);`
`604`	`604`
`605`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`605`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`606`	`606`	`return;`
`607`	`607`	`}`
`608`	`608`
`@@ -643,7 +643,7 @@ SPL_METHOD(SplHeap, extract)`
`643`	`643`	`zval *value;`
`644`	`644`	`spl_heap_object *intern;`
`645`	`645`
`646`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`646`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`647`	`647`	`return;`
`648`	`648`	`}`
`649`	`649`
`@@ -705,7 +705,7 @@ SPL_METHOD(SplPriorityQueue, extract)`
`705`	`705`	`zval value, value_out, **value_out_pp;`
`706`	`706`	`spl_heap_object *intern;`
`707`	`707`
`708`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`708`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`709`	`709`	`return;`
`710`	`710`	`}`
`711`	`711`
`@@ -748,7 +748,7 @@ SPL_METHOD(SplPriorityQueue, top)`
`748`	`748`	`zval value, *value_out;`
`749`	`749`	`spl_heap_object *intern;`
`750`	`750`
`751`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`751`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`752`	`752`	`return;`
`753`	`753`	`}`
`754`	`754`
`@@ -802,7 +802,7 @@ SPL_METHOD(SplHeap, recoverFromCorruption)`
`802`	`802`	`{`
`803`	`803`	`spl_heap_object *intern;`
`804`	`804`
`805`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`805`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`806`	`806`	`return;`
`807`	`807`	`}`
`808`	`808`
`@@ -835,7 +835,7 @@ SPL_METHOD(SplHeap, top)`
`835`	`835`	`zval *value;`
`836`	`836`	`spl_heap_object *intern;`
`837`	`837`
`838`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {`
	`838`	`+ if (zend_parse_parameters_none() == FAILURE) {`
`839`	`839`	`return;`
`840`	`840`	`}`
`841`	`841`