Fixed format specifier and unused variables.

This commit is contained in:
Armin Novak 2017-02-17 14:25:59 +01:00
parent d2f98261f7
commit ff56f75893
2 changed files with 8 additions and 9 deletions

View File

@ -1343,15 +1343,13 @@ static LONG smartcard_AccessStartedEvent_Decode(SMARTCARD_DEVICE* smartcard,
static LONG smartcard_AccessStartedEvent_Call(SMARTCARD_DEVICE* smartcard,
SMARTCARD_OPERATION* operation)
{
LONG status;
Long_Return ret;
status = ret.ReturnCode = SCARD_S_SUCCESS;
LONG status = SCARD_S_SUCCESS;
if (!smartcard->StartedEvent)
smartcard->StartedEvent = SCardAccessStartedEvent();
if (!smartcard->StartedEvent)
status = ret.ReturnCode = SCARD_E_NO_SERVICE;
status = SCARD_E_NO_SERVICE;
return status;
}

View File

@ -581,16 +581,17 @@ void smartcard_trace_list_reader_groups_call(SMARTCARD_DEVICE* smartcard,
if (call->hContext.cbContext > 4)
{
WLog_DBG(TAG, "hContext: 0x%02X%02X%02X%02X%02X%02X%02X%02X (%d)",
WLog_DBG(TAG,
"hContext: 0x%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8" (%"PRIu32")",
pb[0], pb[1], pb[2], pb[3], pb[4], pb[5], pb[6], pb[7], call->hContext.cbContext);
}
else
{
WLog_DBG(TAG, "hContext: 0x%02X%02X%02X%02X (%d)",
WLog_DBG(TAG, "hContext: 0x%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8" (%"PRIu32")",
pb[0], pb[1], pb[2], pb[3], call->hContext.cbContext);
}
WLog_DBG(TAG, "fmszGroupsIsNULL: %d cchGroups: 0x%08X",
WLog_DBG(TAG, "fmszGroupsIsNULL: %"PRId32" cchGroups: 0x%08"PRIx32,
call->fmszGroupsIsNULL, call->cchGroups);
WLog_DBG(TAG, "}");
}
@ -648,9 +649,9 @@ void smartcard_trace_list_reader_groups_return(SMARTCARD_DEVICE* smartcard,
}
WLog_DBG(TAG, "ListReaderGroups%s_Return {", unicode ? "W" : "A");
WLog_DBG(TAG, "ReturnCode: %s (0x%08X)",
WLog_DBG(TAG, "ReturnCode: %s (0x%08"PRIx32")",
SCardGetErrorString(ret->ReturnCode), ret->ReturnCode);
WLog_DBG(TAG, "cBytes: %d msz: %s", ret->cBytes, mszA);
WLog_DBG(TAG, "cBytes: %"PRIu32" msz: %s", ret->cBytes, mszA);
WLog_DBG(TAG, "}");
free(mszA);
}