From 310b1b7c83288ee9f52efb30cf3ed9753fa82892 Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Wed, 21 Sep 2016 20:58:52 +0100
Subject: [PATCH] Use macros for assoc values in gnupg_fetchsignatures

---
 gnupg.c | 56 +++++++++++++++++++-------------------------------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/gnupg.c b/gnupg.c
index d0f5437..dd4e07b 100644
--- a/gnupg.c
+++ b/gnupg.c
@@ -411,23 +411,23 @@ zend_module_entry gnupg_module_entry = {
 ZEND_GET_MODULE(gnupg)
 #endif
 
-#define PHP_GNUPG_ARRAY_ADD_ASSOC_BOOL_EX(_g_arr, _g_struct, _g_name, _g_key) \
+#define PHP_GNUPG_ARRAY_ADD_ASSOC_BOOL_EX(_g_arr, _g_name, _g_struct, _g_key) \
 	PHPC_ARRAY_ADD_ASSOC_BOOL(\
-		PHPC_VAL_CAST_TO_PZVAL(_g_arr), #_g_name, _g_struct->_g_prop);
-#define PHP_GNUPG_ARRAY_ADD_ASSOC_BOOL(_g_arr, _g_struct, _g_name) \
-	PHP_GNUPG_ARRAY_ADD_ASSOC_BOOL_EX(_g_arr, _g_struct, _g_name, _g_name)
+		PHPC_VAL_CAST_TO_PZVAL(_g_arr), #_g_name, _g_struct->_g_key)
+#define PHP_GNUPG_ARRAY_ADD_ASSOC_BOOL(_g_arr, _g_name, _g_struct) \
+	PHP_GNUPG_ARRAY_ADD_ASSOC_BOOL_EX(_g_arr, _g_name, _g_struct, _g_name)
 
-#define PHP_GNUPG_ARRAY_ADD_ASSOC_LONG_EX(_g_arr, _g_struct, _g_name, _g_key) \
+#define PHP_GNUPG_ARRAY_ADD_ASSOC_LONG_EX(_g_arr, _g_name, _g_struct, _g_key) \
 	PHPC_ARRAY_ADD_ASSOC_LONG(\
-		PHPC_VAL_CAST_TO_PZVAL(_g_arr), #_g_name, _g_struct->_g_prop);
-#define PHP_GNUPG_ARRAY_ADD_ASSOC_LONG(_g_arr, _g_struct, _g_name) \
-	PHP_GNUPG_ARRAY_ADD_ASSOC_LONG_EX(_g_arr, _g_struct, _g_name, _g_name)
+		PHPC_VAL_CAST_TO_PZVAL(_g_arr), #_g_name, _g_struct->_g_key)
+#define PHP_GNUPG_ARRAY_ADD_ASSOC_LONG(_g_arr, _g_name, _g_struct) \
+	PHP_GNUPG_ARRAY_ADD_ASSOC_LONG_EX(_g_arr, _g_name, _g_struct, _g_name)
 
-#define PHP_GNUPG_ARRAY_ADD_ASSOC_CSTR_EX(_g_arr, _g_struct, _g_name, _g_key) \
+#define PHP_GNUPG_ARRAY_ADD_ASSOC_CSTR_EX(_g_arr, _g_name, _g_struct, _g_key) \
 	PHPC_ARRAY_ADD_ASSOC_CSTR(\
-		PHPC_VAL_CAST_TO_PZVAL(_g_arr), #_g_name, _g_struct->_g_prop);
-#define PHP_GNUPG_ARRAY_ADD_ASSOC_CSTR(_g_arr, _g_struct, _g_name) \
-	PHP_GNUPG_ARRAY_ADD_ASSOC_CSTR_EX(_g_arr, _g_struct, _g_name, _g_name)
+		PHPC_VAL_CAST_TO_PZVAL(_g_arr), #_g_name, _g_struct->_g_key)
+#define PHP_GNUPG_ARRAY_ADD_ASSOC_CSTR(_g_arr, _g_name, _g_struct) \
+	PHP_GNUPG_ARRAY_ADD_ASSOC_CSTR_EX(_g_arr, _g_name, _g_struct, _g_name)
 
 #define PHP_GNUPG_SET_CLASS_CONST(_name, _value) \
 	zend_declare_class_constant_long(gnupg_class_entry, \
@@ -624,31 +624,13 @@ int gnupg_fetchsignatures(gpgme_signature_t gpgme_signatures, zval *main_arr)
 	while (gpgme_signatures) {
 		PHPC_VAL_MAKE(sig_arr);
 		PHPC_ARRAY_INIT(PHPC_VAL_CAST_TO_PZVAL(sig_arr));
-		PHPC_ARRAY_ADD_ASSOC_CSTR(
-			PHPC_VAL_CAST_TO_PZVAL(sig_arr),
-			"fingerprint",
-			gpgme_signatures->fpr
-		);
-		PHPC_ARRAY_ADD_ASSOC_LONG(
-			PHPC_VAL_CAST_TO_PZVAL(sig_arr),
-			"validity",
-			gpgme_signatures->validity
-		);
-		PHPC_ARRAY_ADD_ASSOC_LONG(
-			PHPC_VAL_CAST_TO_PZVAL(sig_arr),
-			"timestamp",
-			gpgme_signatures->timestamp
-		);
-		PHPC_ARRAY_ADD_ASSOC_LONG(
-			PHPC_VAL_CAST_TO_PZVAL(sig_arr),
-			"status",
-			gpgme_signatures->status
-		);
-		PHPC_ARRAY_ADD_ASSOC_LONG(
-			PHPC_VAL_CAST_TO_PZVAL(sig_arr),
-			"summary",
-			gpgme_signatures->summary
-		);
+		PHP_GNUPG_ARRAY_ADD_ASSOC_CSTR_EX(
+				sig_arr, fingerprint, gpgme_signatures, fpr);
+		PHP_GNUPG_ARRAY_ADD_ASSOC_LONG(sig_arr, validity, gpgme_signatures);
+		PHP_GNUPG_ARRAY_ADD_ASSOC_LONG(sig_arr, timestamp, gpgme_signatures);
+		PHP_GNUPG_ARRAY_ADD_ASSOC_LONG(sig_arr, status, gpgme_signatures);
+		PHP_GNUPG_ARRAY_ADD_ASSOC_LONG(sig_arr, summary, gpgme_signatures);
+
 		PHPC_ARRAY_ADD_NEXT_INDEX_ZVAL(
 			main_arr,
 			PHPC_VAL_CAST_TO_PZVAL(sig_arr)