use consistent terms in system.c and system-keys-win.c

diff --git a/lib/system.c b/lib/system.c
index ab8d89df8e1bc69bce66ce9ca0c1de9b64bff9be..aabe4c0fbc6fe552a01ce4e7bba43fa63e9961a6 100644 (file)
--- a/lib/system.c
+++ b/lib/system.c
@@ -35,14 +35,14 @@
 # include <windows.h>
 # include <wincrypt.h>
 # if defined(__MINGW32__) && !defined(__MINGW64__) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
-typedef PCCRL_CONTEXT WINAPI(*Type_CertEnumCRLsInStore) (HCERTSTORE
+typedef PCCRL_CONTEXT WINAPI(*CertEnumCRLsInStoreFunc) (HCERTSTORE
                                                         hCertStore,
                                                         PCCRL_CONTEXT
                                                         pPrevCrlContext);
-static Type_CertEnumCRLsInStore Loaded_CertEnumCRLsInStore;
+static CertEnumCRLsInStoreFunc pCertEnumCRLsInStore;
 static HMODULE Crypt32_dll;
 # else
-#  define Loaded_CertEnumCRLsInStore CertEnumCRLsInStore
+#  define pCertEnumCRLsInStore CertEnumCRLsInStore
 # endif
 
 #else /* _WIN32 */
@@ -310,10 +310,10 @@ int gnutls_system_global_init(void)
        if (crypto == NULL)
                return GNUTLS_E_CRYPTO_INIT_FAILED;
 
-       Loaded_CertEnumCRLsInStore =
-           (Type_CertEnumCRLsInStore) GetProcAddress(crypto,
+       pCertEnumCRLsInStore =
+           (CertEnumCRLsInStoreFunc) GetProcAddress(crypto,
                                                      "CertEnumCRLsInStore");
-       if (Loaded_CertEnumCRLsInStore == NULL) {
+       if (pCertEnumCRLsInStore == NULL) {
                FreeLibrary(crypto);
                return GNUTLS_E_CRYPTO_INIT_FAILED;
        }
@@ -451,7 +451,7 @@ int add_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags,
                        return GNUTLS_E_FILE_ERROR;
 
                cert = CertEnumCertificatesInStore(store, NULL);
-               crl = Loaded_CertEnumCRLsInStore(store, NULL);
+               crl = pCertEnumCRLsInStore(store, NULL);
 
                while (cert != NULL) {
                        if (cert->dwCertEncodingType == X509_ASN_ENCODING) {
@@ -477,7 +477,7 @@ int add_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags,
                                                                     tl_flags,
                                                                     tl_vflags);
                        }
-                       crl = Loaded_CertEnumCRLsInStore(store, crl);
+                       crl = pCertEnumCRLsInStore(store, crl);
                }
                CertCloseStore(store, 0);
        }