[PATCH] advapi32: Eliminate dead stores (Clang).
Charles Davis
cdavis5x at gmail.com
Fri Sep 14 00:35:23 CDT 2012
From: Charles Davis <cdavis at mymail.mines.edu>
---
dlls/advapi32/cred.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c
index d15feb7..3ccd2c9 100644
--- a/dlls/advapi32/cred.c
+++ b/dlls/advapi32/cred.c
@@ -190,7 +190,6 @@ static DWORD registry_read_credential(HKEY hkey, PCREDENTIALW credential,
else if (ret != ERROR_SUCCESS)
return ret;
credential->CredentialBlobSize = count;
- buffer += count;
}
/* FIXME: Attributes */
@@ -424,7 +423,6 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require
str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len,
(LPWSTR)buffer, 0xffff);
credential->CredentialBlobSize = str_len * sizeof(WCHAR);
- buffer += str_len * sizeof(WCHAR);
*len += str_len * sizeof(WCHAR);
}
else
@@ -615,9 +613,9 @@ static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_b
attr_list.count = 0;
attr_list.attr = NULL;
}
- status = SecKeychainItemModifyAttributesAndData(keychain_item, &attr_list,
- preserve_blob ? 0 : strlen(password),
- preserve_blob ? NULL : password);
+ SecKeychainItemModifyAttributesAndData(keychain_item, &attr_list,
+ preserve_blob ? 0 : strlen(password),
+ preserve_blob ? NULL : password);
if (credential->Comment)
HeapFree(GetProcessHeap(), 0, attrs[0].data);
HeapFree(GetProcessHeap(), 0, password);
@@ -770,17 +768,11 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter,
break;
}
else if (ret != ERROR_SUCCESS)
- {
- ret = ERROR_SUCCESS;
continue;
- }
TRACE("target_name = %s\n", debugstr_w(target_name));
ret = RegOpenKeyExW(hkeyMgr, target_name, 0, KEY_QUERY_VALUE, &hkeyCred);
if (ret != ERROR_SUCCESS)
- {
- ret = ERROR_SUCCESS;
continue;
- }
if (!credential_matches_filter(hkeyCred, filter))
{
RegCloseKey(hkeyCred);
@@ -1676,8 +1668,8 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf
if (TargetInformation->PackageName)
{
TargetInformationW->PackageName = buffer;
- buffer += MultiByteToWideChar(CP_ACP, 0, TargetInformation->PackageName, -1,
- TargetInformationW->PackageName, end - buffer);
+ MultiByteToWideChar(CP_ACP, 0, TargetInformation->PackageName, -1,
+ TargetInformationW->PackageName, end - buffer);
} else
TargetInformationW->PackageName = NULL;
--
1.7.12
More information about the wine-patches
mailing list