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

[c,printf] fix wlog format string to match arguments

Browse Source
This commit is contained in:
akallabeth
2026-01-16 11:42:46 +01:00
parent 60815b1fb7
commit b186c607eb
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
winpr/libwinpr/clipboard/synthetic_file.c
View File

@@ -158,7 +158,9 @@ static WCHAR* convert_local_name_component_to_remote(wClipboard* clipboard, cons
*/
if (!delegate->IsFileNameComponentValid(remote_name))
{
WLog_ERR(TAG, "invalid file name component: %s", local_name);
char name[MAX_PATH] = { 0 };
ConvertWCharToUtf8(local_name, name, sizeof(name) - 1);
WLog_ERR(TAG, "invalid file name component: %s", name);
goto error;
}
@@ -422,7 +424,7 @@ static BOOL process_uri_list(wClipboard* clipboard, const char* data, size_t len
WINPR_ASSERT(clipboard);
WINPR_ASSERT(data);
WLog_VRB(TAG, "processing URI list:\n%.*s", length, data);
WLog_VRB(TAG, "processing URI list:\n%.*s", WINPR_ASSERTING_INT_CAST(int, length), data);
ArrayList_Clear(clipboard->localFiles);
/*
@@ -1040,10 +1042,10 @@ UINT synthetic_file_read_close(struct synthetic_file* file, BOOL force)
file_get_size(file, &size);
if ((file->offset < 0) || ((UINT64)file->offset >= size) || force)
{
WLog_VRB(TAG, "close file %d", file->fd);
WLog_VRB(TAG, "close file %p", file->fd);
if (!CloseHandle(file->fd))
{
WLog_WARN(TAG, "failed to close fd %d: %" PRIu32, file->fd, GetLastError());
WLog_WARN(TAG, "failed to close fd %p: %" PRIu32, file->fd, GetLastError());
}
file->fd = INVALID_HANDLE_VALUE;
@@ -1071,17 +1073,21 @@ static UINT file_get_range(struct synthetic_file* file, UINT64 offset, UINT32 si
FILE_ATTRIBUTE_NORMAL, NULL);
if (INVALID_HANDLE_VALUE == file->fd)
{
char name[MAX_PATH] = { 0 };
ConvertWCharToUtf8(file->local_name, name, sizeof(name) - 1);
error = GetLastError();
WLog_ERR(TAG, "failed to open file %s: 0x%08" PRIx32, file->local_name, error);
WLog_ERR(TAG, "failed to open file %s: 0x%08" PRIx32, name, error);
return error;
}
if (!GetFileInformationByHandle(file->fd, &FileInfo))
{
char name[MAX_PATH] = { 0 };
ConvertWCharToUtf8(file->local_name, name, sizeof(name) - 1);
(void)CloseHandle(file->fd);
file->fd = INVALID_HANDLE_VALUE;
error = GetLastError();
WLog_ERR(TAG, "Get file [%s] information fail: 0x%08" PRIx32, file->local_name, error);
WLog_ERR(TAG, "Get file [%s] information fail: 0x%08" PRIx32, name, error);
return error;
}
@@ -1115,7 +1121,7 @@ static UINT file_get_range(struct synthetic_file* file, UINT64 offset, UINT32 si
if (file->offset != (INT64)offset)
{
WLog_DBG(TAG, "file %d force seeking to %" PRIu64 ", current %" PRIu64, file->fd,
WLog_DBG(TAG, "file %p force seeking to %" PRIu64 ", current %" PRId64, file->fd,
offset, file->offset);
dwHigh = offset >> 32;
@@ -1144,7 +1150,7 @@ static UINT file_get_range(struct synthetic_file* file, UINT64 offset, UINT32 si
*actual_data = buffer;
file->offset += *actual_size;
WLog_VRB(TAG, "file %d actual read %" PRIu32 " bytes (offset %" PRIu64 ")", file->fd,
WLog_VRB(TAG, "file %p actual read %" PRIu32 " bytes (offset %" PRId64 ")", file->fd,
*actual_size, file->offset);
} while (0);