Fixed sign-compare warnings

This commit is contained in:
Armin Novak
2019-02-07 14:33:08 +01:00
parent 116383897e
commit b9b3f3eda7
2 changed files with 10 additions and 5 deletions

View File

@@ -491,21 +491,26 @@ static DWORD filter_device_by_name_a(wLinkedList* list, LPSTR* mszReaders, DWORD
static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWORD cchReaders)
{
int res;
DWORD rc;
LPSTR readers;
if (LinkedList_Count(list) < 1)
return cchReaders;
if (ConvertFromUnicode(CP_UTF8, 0, *mszReaders, (int)cchReaders, &readers, 0, NULL,
NULL) != cchReaders)
res = ConvertFromUnicode(CP_UTF8, 0, *mszReaders, (int)cchReaders, &readers, 0, NULL,
NULL);
if ((res < 0) || ((DWORD)res != cchReaders))
return 0;
free(*mszReaders);
*mszReaders = NULL;
rc = filter_device_by_name_a(list, &readers, cchReaders);
if (ConvertToUnicode(CP_UTF8, 0, readers, (int)rc, mszReaders, 0) != rc)
res = ConvertToUnicode(CP_UTF8, 0, readers, (int)rc, mszReaders, 0);
if ((res < 0) || ((DWORD)res != rc))
rc = 0;
free(readers);

View File

@@ -804,7 +804,7 @@ LONG smartcard_pack_list_readers_return(SMARTCARD_DEVICE* smartcard, wStream* s,
void smartcard_trace_list_readers_return(SMARTCARD_DEVICE* smartcard, ListReaders_Return* ret,
BOOL unicode)
{
int index;
size_t index;
size_t length;
char* mszA = NULL;
@@ -1851,7 +1851,7 @@ LONG smartcard_pack_status_return(SMARTCARD_DEVICE* smartcard, wStream* s, Statu
void smartcard_trace_status_return(SMARTCARD_DEVICE* smartcard, Status_Return* ret, BOOL unicode)
{
int index;
size_t index;
size_t length;
char* pbAtr = NULL;
char* mszReaderNamesA = NULL;