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

[winpr,wlog] Replace WLog_PrintMessage calls

Browse Source 
Prefer WLog_PrintTextMessage to have proper format string checks in
place.
This commit is contained in:
akallabeth
2025-08-13 10:46:57 +02:00
parent df89b04424
commit c3e507a82e
28 changed files with 133 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,9 @@ static BOOL CommInitialized(void)
return TRUE;
}
void CommLog_PrintEx(DWORD level, const char* file, size_t line, const char* fkt, ...)
WINPR_ATTR_FORMAT_ARG(5, 6)
void CommLog_PrintEx(DWORD level, const char* file, size_t line, const char* fkt,
WINPR_FORMAT_ARG const char* fmt, ...)
{
if (!CommInitialized())
return;
@@ -204,8 +206,8 @@ void CommLog_PrintEx(DWORD level, const char* file, size_t line, const char* fkt
if (!WLog_IsLevelActive(sLog, level))
return;
va_list ap = { 0 };
va_start(ap, fkt);
WLog_PrintMessageVA(sLog, WLOG_MESSAGE_TEXT, level, line, file, fkt, ap);
va_start(ap, fmt);
WLog_PrintTextMessageVA(sLog, level, line, file, fkt, fmt, ap);
va_end(ap);
}
@@ -1805,9 +1807,9 @@ static BOOL CommStatusErrorEx(WINPR_COMM* pComm, unsigned long int ctl, const ch
{
if (WLog_IsLevelActive(sLog, level))
{
WLog_PrintMessage(sLog, WLOG_MESSAGE_TEXT, level, line, file, fkt,
"%s [0x%08" PRIx32 "] ioctl failed, errno=[%d] %s.", str, ctl, errno,
winpr_strerror(errno, ebuffer, sizeof(ebuffer)));
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)));
}
}

4
winpr/libwinpr/comm/comm.h
View File

@@ -107,7 +107,9 @@ typedef struct winpr_comm WINPR_COMM;
#define WINPR_PURGE_RXABORT 0x00000002 /* abort pending reception */
#define CommLog_Print(level, ...) CommLog_PrintEx(level, __FILE__, __LINE__, __func__, __VA_ARGS__)
void CommLog_PrintEx(DWORD wlog_level, const char* file, size_t line, const char* fkt, ...);
WINPR_ATTR_FORMAT_ARG(5, 6)
void CommLog_PrintEx(DWORD level, const char* file, size_t line, const char* fkt,
WINPR_FORMAT_ARG const char* fmt, ...);
BOOL CommIsHandled(HANDLE handle);
BOOL CommIsHandleValid(HANDLE handle);

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

@@ -366,9 +366,9 @@ static void log_(const char* tag, const char* msg, CK_RV rv, CK_ULONG index, CK_
if (!WLog_IsLevelActive(log_cached_ptr, log_level))
return;
WLog_PrintMessage(log_cached_ptr, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"%s for slot #%" PRIu32 "(%" PRIu32 "), rv=%s", msg, index, slot,
CK_RV_error_string(rv));
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));
}
static SECURITY_STATUS collect_keys(NCryptP11ProviderHandle* provider, P11EnumKeysState* state)

3
winpr/libwinpr/sspi/Kerberos/kerberos.c
View File

@@ -147,8 +147,7 @@ static krb5_error_code kerberos_log_msg(krb5_context ctx, krb5_error_code code,
if (WLog_IsLevelActive(log, level))
{
const char* msg = krb5_get_error_message(ctx, code);
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, level, line, file, fkt, "%s (%s [%d])",
what, msg, code);
WLog_PrintTextMessage(log, level, line, file, fkt, "%s (%s [%d])", what, msg, code);
krb5_free_error_message(ctx, msg);
}
}

25
winpr/libwinpr/sspi/NTLM/ntlm.c
View File

@@ -53,8 +53,7 @@ static BOOL check_context_(NTLM_CONTEXT* context, const char* file, const char*
if (!context)
{
if (WLog_IsLevelActive(log, log_level))
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context");
WLog_PrintTextMessage(log, log_level, line, file, fkt, "invalid context");
return FALSE;
}
@@ -62,44 +61,42 @@ static BOOL check_context_(NTLM_CONTEXT* context, const char* file, const char*
if (!context->RecvRc4Seal)
{
if (WLog_IsLevelActive(log, log_level))
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context->RecvRc4Seal");
WLog_PrintTextMessage(log, log_level, line, file, fkt, "invalid context->RecvRc4Seal");
rc = FALSE;
}
if (!context->SendRc4Seal)
{
if (WLog_IsLevelActive(log, log_level))
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context->SendRc4Seal");
WLog_PrintTextMessage(log, log_level, line, file, fkt, "invalid context->SendRc4Seal");
rc = FALSE;
}
if (!context->SendSigningKey)
{
if (WLog_IsLevelActive(log, log_level))
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context->SendSigningKey");
WLog_PrintTextMessage(log, log_level, line, file, fkt,
"invalid context->SendSigningKey");
rc = FALSE;
}
if (!context->RecvSigningKey)
{
if (WLog_IsLevelActive(log, log_level))
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context->RecvSigningKey");
WLog_PrintTextMessage(log, log_level, line, file, fkt,
"invalid context->RecvSigningKey");
rc = FALSE;
}
if (!context->SendSealingKey)
{
if (WLog_IsLevelActive(log, log_level))
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context->SendSealingKey");
WLog_PrintTextMessage(log, log_level, line, file, fkt,
"invalid context->SendSealingKey");
rc = FALSE;
}
if (!context->RecvSealingKey)
{
if (WLog_IsLevelActive(log, log_level))
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context->RecvSealingKey");
WLog_PrintTextMessage(log, log_level, line, file, fkt,
"invalid context->RecvSealingKey");
rc = FALSE;
}
return rc;

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

@@ -592,14 +592,16 @@ static char* systemtime2str(const SYSTEMTIME* t, char* buffer, size_t len)
return buffer;
}
static void log_print(wLog* log, DWORD level, const char* file, const char* fkt, size_t line, ...)
WINPR_ATTR_FORMAT_ARG(6, 7)
static void log_print(wLog* log, DWORD level, const char* file, const char* fkt, size_t line,
WINPR_FORMAT_ARG const char* fmt, ...)
{
if (!WLog_IsLevelActive(log, level))
return;
va_list ap = { 0 };
va_start(ap, line);
WLog_PrintMessageVA(log, WLOG_MESSAGE_TEXT, level, line, file, fkt, ap);
va_start(ap, fmt);
WLog_PrintTextMessageVA(log, level, line, file, fkt, fmt, ap);
va_end(ap);
}

17
winpr/libwinpr/utils/cmdline.c
View File

@@ -64,15 +64,14 @@ static void log_error_(DWORD flags, LPCSTR message, int index, WINPR_ATTR_UNUSED
if (!WLog_IsLevelActive(log, level))
return;
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, level, line, file, fkt,
"Failed at index %d [%s]: %s", index,
WLog_PrintTextMessage(log, level, line, file, fkt, "Failed at index %d [%s]: %s", index,
#if defined(WITH_DEBUG_UTILS_CMDLINE_DUMP)
argv
argv
#else
censoredmessage
censoredmessage
#endif
,
message);
,
message);
}
}
@@ -88,11 +87,11 @@ static void log_comma_error_(const char* message, WINPR_ATTR_UNUSED const char*
if (!WLog_IsLevelActive(log, level))
return;
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, level, line, file, fkt, "%s [%s]", message,
WLog_PrintTextMessage(log, level, line, file, fkt, "%s [%s]", message,
#if defined(WITH_DEBUG_UTILS_CMDLINE_DUMP)
argument
argument
#else
censoredmessage
censoredmessage
#endif
);
}