crypt32: avoid shadowing variables

[Austin English]

-- 
-Austin
-------------- next part --------------
diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c
index 50c1bee..aec1659 100644
--- a/dlls/crypt32/msg.c
+++ b/dlls/crypt32/msg.c
@@ -68,14 +68,14 @@ typedef struct _CryptMsgBase
     BOOL                 streamed;
     CMSG_STREAM_INFO     stream_info;
     CryptMsgState        state;
-    CryptMsgCloseFunc    close;
+    CryptMsgCloseFunc    closefunc;
     CryptMsgUpdateFunc   update;
     CryptMsgGetParamFunc get_param;
     CryptMsgControlFunc  control;
 } CryptMsgBase;
 
 static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags,
- PCMSG_STREAM_INFO pStreamInfo, CryptMsgCloseFunc close,
+ PCMSG_STREAM_INFO pStreamInfo, CryptMsgCloseFunc closefunc,
  CryptMsgGetParamFunc get_param, CryptMsgUpdateFunc update,
  CryptMsgControlFunc control)
 {
@@ -91,7 +91,7 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags,
         msg->streamed = FALSE;
         memset(&msg->stream_info, 0, sizeof(msg->stream_info));
     }
-    msg->close = close;
+    msg->closefunc = closefunc;
     msg->get_param = get_param;
     msg->update = update;
     msg->control = control;
@@ -2392,11 +2392,11 @@ static BOOL CDecodeMsg_FinalizeSignedContent(CDecodeMsg *msg,
              !strcmp(msg->u.signed_data.info->content.pszObjId,
              szOID_RSA_data))
             {
-                CRYPT_DATA_BLOB *blob;
+                CRYPT_DATA_BLOB *data_blob;
 
                 ret = CryptDecodeObjectEx(X509_ASN_ENCODING,
                  X509_OCTET_STRING, content->pbData, content->cbData,
-                 CRYPT_DECODE_ALLOC_FLAG, NULL, &blob, &size);
+                 CRYPT_DECODE_ALLOC_FLAG, NULL, &data_blob, &size);
                 if (ret)
                 {
                     ret = CSignedMsgData_Update(&msg->u.signed_data,
@@ -3577,8 +3577,8 @@ BOOL WINAPI CryptMsgClose(HCRYPTMSG hCryptMsg)
         if (InterlockedDecrement(&msg->ref) == 0)
         {
             TRACE("freeing %p\n", msg);
-            if (msg->close)
-                msg->close(msg);
+            if (msg->closefunc)
+                msg->closefunc(msg);
             CryptMemFree(msg);
         }
     }