More review fixes

nielsdos · nielsdos · commit 3abdf5f501b8 · 2023-02-19T22:42:30.000+01:00
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -802,14 +802,14 @@ static int curl_ssh_hostkeyfunction(void *clientp, int keytype, const char *key,
 	} else if (!Z_ISUNDEF(retval)) {
 		_php_curl_verify_handlers(ch, /* reporterror */ true);
 		if (Z_TYPE(retval) == IS_LONG) {
-			zend_long retval_long = zval_get_long(&retval);
+			zend_long retval_long = Z_LVAL(retval);
 			if (retval_long == CURLKHMATCH_OK || retval_long == CURLKHMATCH_MISMATCH) {
 				rval = retval_long;
 			} else {
 				zend_throw_error(NULL, "The CURLOPT_SSH_HOSTKEYFUNCTION callback must return either CURLKHMATCH_OK or CURLKHMATCH_MISMATCH");
 			}
 		} else {
-			zend_type_error("The CURLOPT_SSH_HOSTKEYFUNCTION callback must return an integer");
+			zend_type_error("The CURLOPT_SSH_HOSTKEYFUNCTION callback must return either CURLKHMATCH_OK or CURLKHMATCH_MISMATCH");
 		}
 	}
 	zval_ptr_dtor(&argv[0]);

Original file line number	Diff line number	Diff line change
`@@ -802,14 +802,14 @@ static int curl_ssh_hostkeyfunction(void clientp, int keytype, const char key,`
`802`	`802`	`} else if (!Z_ISUNDEF(retval)) {`
`803`	`803`	`_php_curl_verify_handlers(ch, /* reporterror */ true);`
`804`	`804`	`if (Z_TYPE(retval) == IS_LONG) {`
`805`		`- zend_long retval_long = zval_get_long(&retval);`
	`805`	`+ zend_long retval_long = Z_LVAL(retval);`
`806`	`806`	`if (retval_long == CURLKHMATCH_OK \|\| retval_long == CURLKHMATCH_MISMATCH) {`
`807`	`807`	`rval = retval_long;`
`808`	`808`	`} else {`
`809`	`809`	`zend_throw_error(NULL, "The CURLOPT_SSH_HOSTKEYFUNCTION callback must return either CURLKHMATCH_OK or CURLKHMATCH_MISMATCH");`
`810`	`810`	`}`
`811`	`811`	`} else {`
`812`		`- zend_type_error("The CURLOPT_SSH_HOSTKEYFUNCTION callback must return an integer");`
	`812`	`+ zend_type_error("The CURLOPT_SSH_HOSTKEYFUNCTION callback must return either CURLKHMATCH_OK or CURLKHMATCH_MISMATCH");`
`813`	`813`	`}`
`814`	`814`	`}`
`815`	`815`	`zval_ptr_dtor(&argv[0]);`