Andrew Talbot : crypt32: Cast-qual warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Sep 7 07:12:20 CDT 2006
Module: wine
Branch: master
Commit: 950b838e2865e4a442d54fbd103f17ff36a3d0ba
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=950b838e2865e4a442d54fbd103f17ff36a3d0ba
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Tue Sep 5 14:50:22 2006 +0100
crypt32: Cast-qual warnings fix.
---
dlls/crypt32/encode.c | 6 +++---
dlls/crypt32/protectdata.c | 8 ++++----
dlls/crypt32/str.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
index 9d9aca4..cd70eca 100644
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -1019,7 +1019,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNameVa
__TRY
{
- const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo;
+ const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo;
switch (value->dwValueType)
{
@@ -1159,7 +1159,7 @@ static BOOL WINAPI CRYPT_AsnEncodeRdnAtt
static int BLOBComp(const void *l, const void *r)
{
- CRYPT_DER_BLOB *a = (CRYPT_DER_BLOB *)l, *b = (CRYPT_DER_BLOB *)r;
+ const CRYPT_DER_BLOB *a = (const CRYPT_DER_BLOB *)l, *b = (const CRYPT_DER_BLOB *)r;
int ret;
if (!(ret = memcmp(a->pbData, b->pbData, min(a->cbData, b->cbData))))
@@ -1564,7 +1564,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicod
__TRY
{
- const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo;
+ const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo;
switch (value->dwValueType)
{
diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c
index 4b7cfc9..75846e7 100644
--- a/dlls/crypt32/protectdata.c
+++ b/dlls/crypt32/protectdata.c
@@ -555,7 +555,7 @@ void free_protect_data(struct protect_da
/* copies a string into a data blob */
static
-BYTE * convert_str_to_blob(char* str, DATA_BLOB* blob)
+BYTE *convert_str_to_blob(LPCSTR str, DATA_BLOB *blob)
{
if (!str || !blob) return NULL;
@@ -590,11 +590,11 @@ BOOL fill_protect_data(struct protect_da
pInfo->count0=0x0001;
- convert_str_to_blob((char*)crypt_magic_str,&pInfo->info0);
+ convert_str_to_blob(crypt_magic_str, &pInfo->info0);
pInfo->count1=0x0001;
- convert_str_to_blob((char*)crypt_magic_str,&pInfo->info1);
+ convert_str_to_blob(crypt_magic_str, &pInfo->info1);
pInfo->null0=0x0000;
@@ -606,7 +606,7 @@ BOOL fill_protect_data(struct protect_da
pInfo->unknown0=0x0000;
pInfo->unknown1=0x0000;
- convert_str_to_blob((char*)crypt_magic_str,&pInfo->data0);
+ convert_str_to_blob(crypt_magic_str, &pInfo->data0);
pInfo->null1=0x0000;
pInfo->unknown2=0x0000;
diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c
index 415cc43..e118748 100644
--- a/dlls/crypt32/str.c
+++ b/dlls/crypt32/str.c
@@ -572,7 +572,7 @@ static DWORD CRYPT_GetNextValueW(LPCWSTR
while (*separators)
map[*separators++] = 1;
- while (*str && (*str >= 0xff || !map[*(unsigned short *)str]))
+ while (*str && (*str >= 0xff || !map[*(const unsigned short *)str]))
str++;
token->end = str;
}
More information about the wine-cvs
mailing list