Zend/zend_ini: fix zend_result return values

MaxKellermann · Girgias · commit d51eb1d74ce7 · 2023-02-21T13:40:54.000Z
The value "1" was illegal.

Signed-off-by: George Peter Banyard &lt;girgias@php.net&gt;
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
@@ -57,7 +57,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag
 		}
 		if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
 			/* runtime failure is OK */
-			return 1;
+			return FAILURE;
 		}
 		if (ini_entry->value != ini_entry->orig_value) {
 			zend_string_release(ini_entry->value);
@@ -68,7 +68,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag
 		ini_entry->orig_value = NULL;
 		ini_entry->orig_modifiable = 0;
 	}
-	return 0;
+	return SUCCESS;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag`
`57`	`57`	`}`
`58`	`58`	`if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {`
`59`	`59`	`/* runtime failure is OK */`
`60`		`- return 1;`
	`60`	`+ return FAILURE;`
`61`	`61`	`}`
`62`	`62`	`if (ini_entry->value != ini_entry->orig_value) {`
`63`	`63`	`zend_string_release(ini_entry->value);`
`@@ -68,7 +68,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag`
`68`	`68`	`ini_entry->orig_value = NULL;`
`69`	`69`	`ini_entry->orig_modifiable = 0;`
`70`	`70`	`}`
`71`		`- return 0;`
	`71`	`+ return SUCCESS;`
`72`	`72`	`}`
`73`	`73`	`/* }}} */`
`74`	`74`