Crypt32: Cast-qual warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Tue Sep 5 08:50:22 CDT 2006
Changelog:
Crypt32: Cast-qual warnings fix.
diff -urN a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
--- a/dlls/crypt32/encode.c 2006-07-27 17:27:18.000000000 +0100
+++ b/dlls/crypt32/encode.c 2006-09-05 00:17:02.000000000 +0100
@@ -1019,7 +1019,7 @@
__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 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 @@
__TRY
{
- const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo;
+ const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo;
switch (value->dwValueType)
{
diff -urN a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c
--- a/dlls/crypt32/protectdata.c 2006-07-06 12:10:39.000000000 +0100
+++ b/dlls/crypt32/protectdata.c 2006-09-05 13:31:50.000000000 +0100
@@ -555,7 +555,7 @@
/* 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 @@
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 @@
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 -urN a/dlls/crypt32/str.c b/dlls/crypt32/str.c
--- a/dlls/crypt32/str.c 2006-08-02 17:16:45.000000000 +0100
+++ b/dlls/crypt32/str.c 2006-09-05 14:28:40.000000000 +0100
@@ -572,7 +572,7 @@
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-patches
mailing list