morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[warnings] Fix format string errors

Browse Source 
* Fix casts of format string arguments (%p requires void*)
* Fix format string to match type of arguments
This commit is contained in:
akallabeth
2025-08-13 09:00:25 +02:00
parent c3e507a82e
commit 65f18983ed
51 changed files with 439 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winpr/libwinpr/comm/comm.c
View File

@@ -645,7 +645,7 @@ BOOL SetCommState(HANDLE hFile, LPDCB lpDCB)
break;
default:
CommLog_Print(WLOG_WARN, "Unexpected fDtrControl value: %" PRIu32 "\n",
CommLog_Print(WLOG_WARN, "Unexpected fDtrControl value: %" PRId32 "\n",
lpDCB->fDtrControl);
return FALSE;
}
@@ -700,7 +700,7 @@ BOOL SetCommState(HANDLE hFile, LPDCB lpDCB)
break;
default:
CommLog_Print(WLOG_WARN, "Unexpected fRtsControl value: %" PRIu32 "\n",
CommLog_Print(WLOG_WARN, "Unexpected fRtsControl value: %" PRId32 "\n",
lpDCB->fRtsControl);
return FALSE;
}
@@ -1808,8 +1808,8 @@ static BOOL CommStatusErrorEx(WINPR_COMM* pComm, unsigned long int ctl, const ch
if (WLog_IsLevelActive(sLog, level))
{
WLog_PrintTextMessage(sLog, level, line, file, fkt,
"%s [0x%08" PRIx32 "] ioctl failed, errno=[%d] %s.", str, ctl,
errno, winpr_strerror(errno, ebuffer, sizeof(ebuffer)));
"%s [0x%08lx] ioctl failed, errno=[%d] %s.", str, ctl, errno,
winpr_strerror(errno, ebuffer, sizeof(ebuffer)));
}
}

2
winpr/libwinpr/comm/comm_ioctl.c
View File

@@ -101,7 +101,7 @@ static BOOL s_CommDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID
case SerialDriverUnknown:
default:
CommLog_Print(WLOG_DEBUG, "Unknown remote serial driver (%d), using SerCx2.sys",
CommLog_Print(WLOG_DEBUG, "Unknown remote serial driver (%u), using SerCx2.sys",
pComm->serverSerialDriverId);
pServerSerialDriver = SerCx2Sys_s();
break;

4
winpr/libwinpr/comm/comm_serial_sys.c
View File

@@ -1151,13 +1151,13 @@ static BOOL set_queue_size(WINPR_ATTR_UNUSED WINPR_COMM* pComm, const SERIAL_QUE
if (pQueueSize->InSize > N_TTY_BUF_SIZE)
CommLog_Print(WLOG_WARN,
"Requested an incompatible input buffer size: %" PRIu32
", keeping on with a %" PRIu32 " bytes buffer.",
", keeping on with a %d bytes buffer.",
pQueueSize->InSize, N_TTY_BUF_SIZE);
if (pQueueSize->OutSize > N_TTY_BUF_SIZE)
CommLog_Print(WLOG_WARN,
"Requested an incompatible output buffer size: %" PRIu32
", keeping on with a %" PRIu32 " bytes buffer.",
", keeping on with a %d bytes buffer.",
pQueueSize->OutSize, N_TTY_BUF_SIZE);
SetLastError(ERROR_CANCELLED);

3
winpr/libwinpr/ncrypt/ncrypt_pkcs11.c
View File

@@ -367,8 +367,7 @@ static void log_(const char* tag, const char* msg, CK_RV rv, CK_ULONG index, CK_
return;
WLog_PrintTextMessage(log_cached_ptr, log_level, line, file, fkt,
"%s for slot #%" PRIu32 "(%" PRIu32 "), rv=%s", msg, index, slot,
CK_RV_error_string(rv));
"%s for slot #%lu(%lu), rv=%s", msg, index, slot, CK_RV_error_string(rv));
}
static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKeysState* state)

60
winpr/libwinpr/sspi/sspi.c
View File

@@ -523,7 +523,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesW(ULONG* pcPackages,
status = g_SspiW->EnumerateSecurityPackagesW(pcPackages, ppPackageInfo);
WLog_Print(g_Log, WLOG_DEBUG, "EnumerateSecurityPackagesW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -542,7 +542,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EnumerateSecurityPackagesA(ULONG* pcPackages,
status = g_SspiA->EnumerateSecurityPackagesA(pcPackages, ppPackageInfo);
WLog_Print(g_Log, WLOG_DEBUG, "EnumerateSecurityPackagesA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -575,7 +575,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoW(SEC_WCHAR* pszPackageNa
status = g_SspiW->QuerySecurityPackageInfoW(pszPackageName, ppPackageInfo);
WLog_Print(g_Log, WLOG_DEBUG, "QuerySecurityPackageInfoW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -594,7 +594,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityPackageInfoA(SEC_CHAR* pszPackageNam
status = g_SspiA->QuerySecurityPackageInfoA(pszPackageName, ppPackageInfo);
WLog_Print(g_Log, WLOG_DEBUG, "QuerySecurityPackageInfoA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -619,7 +619,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleW(
pAuthData, pGetKeyFn, pvGetKeyArgument,
phCredential, ptsExpiry);
WLog_Print(g_Log, WLOG_DEBUG, "AcquireCredentialsHandleW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -642,7 +642,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcquireCredentialsHandleA(
pAuthData, pGetKeyFn, pvGetKeyArgument,
phCredential, ptsExpiry);
WLog_Print(g_Log, WLOG_DEBUG, "AcquireCredentialsHandleA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -661,7 +661,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ExportSecurityContext(PCtxtHandle phContext, ULON
status = g_SspiW->ExportSecurityContext(phContext, fFlags, pPackedContext, pToken);
WLog_Print(g_Log, WLOG_DEBUG, "ExportSecurityContext: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -679,7 +679,7 @@ SECURITY_STATUS SEC_ENTRY sspi_FreeCredentialsHandle(PCredHandle phCredential)
status = g_SspiW->FreeCredentialsHandle(phCredential);
WLog_Print(g_Log, WLOG_DEBUG, "FreeCredentialsHandle: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -699,7 +699,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextW(SEC_WCHAR* pszPackage,
status = g_SspiW->ImportSecurityContextW(pszPackage, pPackedContext, pToken, phContext);
WLog_Print(g_Log, WLOG_DEBUG, "ImportSecurityContextW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -719,7 +719,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImportSecurityContextA(SEC_CHAR* pszPackage,
status = g_SspiA->ImportSecurityContextA(pszPackage, pPackedContext, pToken, phContext);
WLog_Print(g_Log, WLOG_DEBUG, "ImportSecurityContextA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -738,7 +738,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesW(PCredHandle phCredent
status = g_SspiW->QueryCredentialsAttributesW(phCredential, ulAttribute, pBuffer);
WLog_Print(g_Log, WLOG_DEBUG, "QueryCredentialsAttributesW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -757,7 +757,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryCredentialsAttributesA(PCredHandle phCredent
status = g_SspiA->QueryCredentialsAttributesA(phCredential, ulAttribute, pBuffer);
WLog_Print(g_Log, WLOG_DEBUG, "QueryCredentialsAttributesA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -784,7 +784,7 @@ SECURITY_STATUS SEC_ENTRY sspi_AcceptSecurityContext(PCredHandle phCredential,
g_SspiW->AcceptSecurityContext(phCredential, phContext, pInput, fContextReq, TargetDataRep,
phNewContext, pOutput, pfContextAttr, ptsTimeStamp);
WLog_Print(g_Log, WLOG_DEBUG, "AcceptSecurityContext: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -802,7 +802,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ApplyControlToken(PCtxtHandle phContext, PSecBuff
status = g_SspiW->ApplyControlToken(phContext, pInput);
WLog_Print(g_Log, WLOG_DEBUG, "ApplyControlToken: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -820,7 +820,7 @@ SECURITY_STATUS SEC_ENTRY sspi_CompleteAuthToken(PCtxtHandle phContext, PSecBuff
status = g_SspiW->CompleteAuthToken(phContext, pToken);
WLog_Print(g_Log, WLOG_DEBUG, "CompleteAuthToken: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -838,7 +838,7 @@ SECURITY_STATUS SEC_ENTRY sspi_DeleteSecurityContext(PCtxtHandle phContext)
status = g_SspiW->DeleteSecurityContext(phContext);
WLog_Print(g_Log, WLOG_DEBUG, "DeleteSecurityContext: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -856,7 +856,7 @@ SECURITY_STATUS SEC_ENTRY sspi_FreeContextBuffer(void* pvContextBuffer)
status = g_SspiW->FreeContextBuffer(pvContextBuffer);
WLog_Print(g_Log, WLOG_DEBUG, "FreeContextBuffer: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -874,7 +874,7 @@ SECURITY_STATUS SEC_ENTRY sspi_ImpersonateSecurityContext(PCtxtHandle phContext)
status = g_SspiW->ImpersonateSecurityContext(phContext);
WLog_Print(g_Log, WLOG_DEBUG, "ImpersonateSecurityContext: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -897,7 +897,7 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextW(
phCredential, phContext, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput,
Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry);
WLog_Print(g_Log, WLOG_DEBUG, "InitializeSecurityContextW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -920,7 +920,7 @@ SECURITY_STATUS SEC_ENTRY sspi_InitializeSecurityContextA(
phCredential, phContext, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput,
Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry);
WLog_Print(g_Log, WLOG_DEBUG, "InitializeSecurityContextA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -939,7 +939,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesW(PCtxtHandle phContext, UL
status = g_SspiW->QueryContextAttributesW(phContext, ulAttribute, pBuffer);
WLog_Print(g_Log, WLOG_DEBUG, "QueryContextAttributesW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -958,7 +958,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QueryContextAttributesA(PCtxtHandle phContext, UL
status = g_SspiA->QueryContextAttributesA(phContext, ulAttribute, pBuffer);
WLog_Print(g_Log, WLOG_DEBUG, "QueryContextAttributesA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -976,7 +976,7 @@ SECURITY_STATUS SEC_ENTRY sspi_QuerySecurityContextToken(PCtxtHandle phContext,
status = g_SspiW->QuerySecurityContextToken(phContext, phToken);
WLog_Print(g_Log, WLOG_DEBUG, "QuerySecurityContextToken: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -995,7 +995,7 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesW(PCtxtHandle phContext, ULON
status = g_SspiW->SetContextAttributesW(phContext, ulAttribute, pBuffer, cbBuffer);
WLog_Print(g_Log, WLOG_DEBUG, "SetContextAttributesW: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -1014,7 +1014,7 @@ SECURITY_STATUS SEC_ENTRY sspi_SetContextAttributesA(PCtxtHandle phContext, ULON
status = g_SspiA->SetContextAttributesA(phContext, ulAttribute, pBuffer, cbBuffer);
WLog_Print(g_Log, WLOG_DEBUG, "SetContextAttributesA: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -1032,7 +1032,7 @@ SECURITY_STATUS SEC_ENTRY sspi_RevertSecurityContext(PCtxtHandle phContext)
status = g_SspiW->RevertSecurityContext(phContext);
WLog_Print(g_Log, WLOG_DEBUG, "RevertSecurityContext: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -1053,7 +1053,7 @@ SECURITY_STATUS SEC_ENTRY sspi_DecryptMessage(PCtxtHandle phContext, PSecBufferD
status = g_SspiW->DecryptMessage(phContext, pMessage, MessageSeqNo, pfQOP);
WLog_Print(g_Log, WLOG_DEBUG, "DecryptMessage: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -1072,7 +1072,7 @@ SECURITY_STATUS SEC_ENTRY sspi_EncryptMessage(PCtxtHandle phContext, ULONG fQOP,
status = g_SspiW->EncryptMessage(phContext, fQOP, pMessage, MessageSeqNo);
WLog_Print(g_Log, WLOG_DEBUG, "EncryptMessage: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -1091,7 +1091,7 @@ SECURITY_STATUS SEC_ENTRY sspi_MakeSignature(PCtxtHandle phContext, ULONG fQOP,
status = g_SspiW->MakeSignature(phContext, fQOP, pMessage, MessageSeqNo);
WLog_Print(g_Log, WLOG_DEBUG, "MakeSignature: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}
@@ -1110,7 +1110,7 @@ SECURITY_STATUS SEC_ENTRY sspi_VerifySignature(PCtxtHandle phContext, PSecBuffer
status = g_SspiW->VerifySignature(phContext, pMessage, MessageSeqNo, pfQOP);
WLog_Print(g_Log, WLOG_DEBUG, "VerifySignature: %s (0x%08" PRIX32 ")",
GetSecurityStatusString(status), status);
GetSecurityStatusString(status), WINPR_CXX_COMPAT_CAST(UINT32, status));
return status;
}

6
winpr/libwinpr/timezone/timezone.c
View File

@@ -616,20 +616,20 @@ static void log_timezone_(const DYNAMIC_TIME_ZONE_INFORMATION* tzif, DWORD resul
wLog* log = WLog_Get(TAG);
log_print(log, level, file, fkt, line, "DYNAMIC_TIME_ZONE_INFORMATION {");
log_print(log, level, file, fkt, line, " Bias=%" PRIu32, tzif->Bias);
log_print(log, level, file, fkt, line, " Bias=%" PRId32, tzif->Bias);
(void)ConvertWCharNToUtf8(tzif->StandardName, ARRAYSIZE(tzif->StandardName), buffer,
ARRAYSIZE(buffer));
log_print(log, level, file, fkt, line, " StandardName=%s", buffer);
log_print(log, level, file, fkt, line, " StandardDate=%s",
systemtime2str(&tzif->StandardDate, buffer, sizeof(buffer)));
log_print(log, level, file, fkt, line, " StandardBias=%" PRIu32, tzif->StandardBias);
log_print(log, level, file, fkt, line, " StandardBias=%" PRId32, tzif->StandardBias);
(void)ConvertWCharNToUtf8(tzif->DaylightName, ARRAYSIZE(tzif->DaylightName), buffer,
ARRAYSIZE(buffer));
log_print(log, level, file, fkt, line, " DaylightName=%s", buffer);
log_print(log, level, file, fkt, line, " DaylightDate=%s",
systemtime2str(&tzif->DaylightDate, buffer, sizeof(buffer)));
log_print(log, level, file, fkt, line, " DaylightBias=%" PRIu32, tzif->DaylightBias);
log_print(log, level, file, fkt, line, " DaylightBias=%" PRId32, tzif->DaylightBias);
(void)ConvertWCharNToUtf8(tzif->TimeZoneKeyName, ARRAYSIZE(tzif->TimeZoneKeyName), buffer,
ARRAYSIZE(buffer));
log_print(log, level, file, fkt, line, " TimeZoneKeyName=%s", buffer);

2
winpr/libwinpr/utils/print.c
View File

@@ -70,7 +70,7 @@ void winpr_HexLogDump(wLog* log, UINT32 level, const void* data, size_t length)
if (!buffer)
{
char ebuffer[256] = { 0 };
WLog_Print(log, WLOG_ERROR, "malloc(%" PRIuz ") failed with [%" PRIuz "] %s", blen, errno,
WLog_Print(log, WLOG_ERROR, "malloc(%" PRIuz ") failed with [%d] %s", blen, errno,
winpr_strerror(errno, ebuffer, sizeof(ebuffer)));
return;
}

2
winpr/libwinpr/utils/stream.c
View File

@@ -358,7 +358,7 @@ BOOL Stream_CheckAndLogRequiredCapacityWLogExVa(wLog* log, DWORD level, wStream*
(void)vsnprintf(prefix, sizeof(prefix), fmt, args);
WLog_Print(log, level,
"[%s] invalid remaining capacity, got %" PRIuz ", require at least %" PRIu64
"[%s] invalid remaining capacity, got %" PRIuz ", require at least %" PRIuz
" [element size=%" PRIuz "]",
prefix, actual, nmemb, size);
winpr_log_backtrace_ex(log, level, 20);