secp256k1.c rename vars, and move a line up

Author: afk11

secp256k1/secp256k1.c

@@ -2557,21 +2557,23 @@ PHP_FUNCTION (secp256k1_schnorrsig_sign)
 /* {{{ proto int secp256k1_schnorrsig_verify(resource context, resource sig, string msg32, resource pubKey)
  * Verify a Schnorr signature. */
 PHP_FUNCTION(secp256k1_schnorrsig_verify) {
-    zval *zCtx, *zSchnorrSig, *zSchnorrSigPubKey;
+    zval *zCtx, *zSchnorrSig, *zXOnlyPubKey;
     secp256k1_context *ctx;
     secp256k1_schnorrsig *sig;
     secp256k1_xonly_pubkey *pubkey;
     zend_string *msg32;
     int result;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrSr", &zCtx, &zSchnorrSig, &msg32, &zSchnorrSigPubKey) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrSr", &zCtx, &zSchnorrSig, &msg32, &zXOnlyPubKey) == FAILURE) {
         RETURN_LONG(0);
     }
 
     if ((ctx = php_get_secp256k1_context(zCtx)) == NULL) {
         RETURN_LONG(0);
     } else if ((sig = php_get_secp256k1_schnorr_signature(zSchnorrSig)) == NULL) {
         RETURN_LONG(0);
+    } else if ((pubkey = php_get_secp256k1_xonly_pubkey(zXOnlyPubKey)) == NULL) {
+        RETURN_LONG(0);
     }
 
     if (msg32->len != HASH_LENGTH) {
@@ -2580,10 +2582,6 @@ PHP_FUNCTION(secp256k1_schnorrsig_verify) {
         return;
     }
 
-    if ((pubkey = php_get_secp256k1_xonly_pubkey(zSchnorrSigPubKey)) == NULL) {
-        RETURN_LONG(0);
-    }
-
     result = secp256k1_schnorrsig_verify(ctx, sig, (unsigned char *) msg32->val, pubkey);
     RETURN_LONG(result);
 }
@@ -2593,7 +2591,7 @@ PHP_FUNCTION(secp256k1_schnorrsig_verify) {
  * Verify a Schnorr signature. */
 PHP_FUNCTION(secp256k1_schnorrsig_verify_batch)
 {
-    zval *zCtx, *zScratch, *zSigArray, *zMsg32Array, *zSchnorrSigPubKeyArray, *arrayZval;
+    zval *zCtx, *zScratch, *zSigArray, *zMsg32Array, *zXOnlyPubKeyArray, *arrayZval;
     zend_long numsigs;
     secp256k1_context *ctx;
     secp256k1_scratch_space_wrapper *scratch_wrap;
@@ -2607,7 +2605,7 @@ PHP_FUNCTION(secp256k1_schnorrsig_verify_batch)
     int result = 0, i = 0;
 
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rraaal",
-        &zCtx, &zScratch, &zSigArray, &zMsg32Array, &zSchnorrSigPubKeyArray, &numsigs) == FAILURE) {
+        &zCtx, &zScratch, &zSigArray, &zMsg32Array, &zXOnlyPubKeyArray, &numsigs) == FAILURE) {
         RETURN_LONG(result);
     }
 
@@ -2619,7 +2617,7 @@ PHP_FUNCTION(secp256k1_schnorrsig_verify_batch)
         RETURN_LONG(result);
     }
 
-    if ((size_t) numsigs != (size_t) zend_hash_num_elements(Z_ARRVAL_P(zSchnorrSigPubKeyArray)) ||
+    if ((size_t) numsigs != (size_t) zend_hash_num_elements(Z_ARRVAL_P(zXOnlyPubKeyArray)) ||
         (size_t) numsigs != (size_t) zend_hash_num_elements(Z_ARRVAL_P(zMsg32Array)) ||
         (size_t) numsigs != (size_t) zend_hash_num_elements(Z_ARRVAL_P(zSigArray))) {
         RETURN_LONG(result);
@@ -2647,7 +2645,7 @@ PHP_FUNCTION(secp256k1_schnorrsig_verify_batch)
     } ZEND_HASH_FOREACH_END();
 
     pubkeys = emalloc(sizeof(secp256k1_xonly_pubkey *) * numsigs);
-    arr_hash = Z_ARRVAL_P(zSchnorrSigPubKeyArray);
+    arr_hash = Z_ARRVAL_P(zXOnlyPubKeyArray);
     ZEND_HASH_FOREACH_KEY_VAL(arr_hash, i, arrayKeyStr, arrayZval) {
         if ((pubkey = php_get_secp256k1_xonly_pubkey(arrayZval)) == NULL) {
             efree(sigs);