crypt32/tests(1/6): Don't shadow a variable with a variable of a different type
Juan Lang
juan.lang at gmail.com
Wed May 30 16:20:27 CDT 2012
--Juan
-------------- next part --------------
From 728b013f2ca52de878dc65633a9c6cbcb1a9002c Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Thu, 17 May 2012 15:55:16 -0700
Subject: [PATCH 2/7] Don't shadow a variable with a variable of a different
type
---
dlls/crypt32/tests/cert.c | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c
index 9678053..6e46a57 100644
--- a/dlls/crypt32/tests/cert.c
+++ b/dlls/crypt32/tests/cert.c
@@ -2098,7 +2098,6 @@ static void testCreateSelfSignCert(void)
if (context)
{
DWORD size = 0;
- PCRYPT_KEY_PROV_INFO info;
/* The context must have a key provider info property */
ret = CertGetCertificateContextProperty(context,
@@ -2106,24 +2105,25 @@ static void testCreateSelfSignCert(void)
ok(ret && size, "Expected non-zero key provider info\n");
if (size)
{
- info = HeapAlloc(GetProcessHeap(), 0, size);
- if (info)
+ PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size);
+
+ if (pInfo)
{
ret = CertGetCertificateContextProperty(context,
- CERT_KEY_PROV_INFO_PROP_ID, info, &size);
+ CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size);
ok(ret, "CertGetCertificateContextProperty failed: %08x\n",
GetLastError());
if (ret)
{
/* Sanity-check the key provider */
- ok(!lstrcmpW(info->pwszContainerName, cspNameW),
+ ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW),
"Unexpected key container\n");
- ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W),
+ ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W),
"Unexpected provider\n");
- ok(info->dwKeySpec == AT_SIGNATURE,
- "Expected AT_SIGNATURE, got %d\n", info->dwKeySpec);
+ ok(pInfo->dwKeySpec == AT_SIGNATURE,
+ "Expected AT_SIGNATURE, got %d\n", pInfo->dwKeySpec);
}
- HeapFree(GetProcessHeap(), 0, info);
+ HeapFree(GetProcessHeap(), 0, pInfo);
}
}
@@ -2152,7 +2152,6 @@ static void testCreateSelfSignCert(void)
if (context)
{
DWORD size = 0;
- PCRYPT_KEY_PROV_INFO info;
/* The context must have a key provider info property */
ret = CertGetCertificateContextProperty(context,
@@ -2160,24 +2159,25 @@ static void testCreateSelfSignCert(void)
ok(ret && size, "Expected non-zero key provider info\n");
if (size)
{
- info = HeapAlloc(GetProcessHeap(), 0, size);
- if (info)
+ PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size);
+
+ if (pInfo)
{
ret = CertGetCertificateContextProperty(context,
- CERT_KEY_PROV_INFO_PROP_ID, info, &size);
+ CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size);
ok(ret, "CertGetCertificateContextProperty failed: %08x\n",
GetLastError());
if (ret)
{
/* Sanity-check the key provider */
- ok(!lstrcmpW(info->pwszContainerName, cspNameW),
+ ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW),
"Unexpected key container\n");
- ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W),
+ ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W),
"Unexpected provider\n");
- ok(info->dwKeySpec == AT_KEYEXCHANGE,
- "Expected AT_KEYEXCHANGE, got %d\n", info->dwKeySpec);
+ ok(pInfo->dwKeySpec == AT_KEYEXCHANGE,
+ "Expected AT_KEYEXCHANGE, got %d\n", pInfo->dwKeySpec);
}
- HeapFree(GetProcessHeap(), 0, info);
+ HeapFree(GetProcessHeap(), 0, pInfo);
}
}
--
1.7.7.3
More information about the wine-devel
mailing list