mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7057 from akallabeth/urbdrc_improve_log 

Add more information to urbdrc log entries
This commit is contained in:
David Fort 2021-05-28 11:18:47 +02:00 committed by GitHub
parent 1f1ce81b22 51919af2d6
commit 96c6f94e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
channels/urbdrc/client/libusb/libusb_udevice.c
View File

@ -130,8 +130,11 @@ static void set_stream_id_for_buffer(struct libusb_transfer* transfer, UINT32 st
user_data->streamID = streamID;
#endif
}
static BOOL log_libusb_result(wLog* log, DWORD lvl, const char* fmt, int error, ...)
static BOOL log_libusb_result_(wLog* log, DWORD lvl, const char* fmt, const char* fkt,
const char* file, size_t line, int error, ...)
{
WINPR_UNUSED(file);
if (error < 0)
{
char buffer[8192] = { 0 };
@ -140,12 +143,16 @@ static BOOL log_libusb_result(wLog* log, DWORD lvl, const char* fmt, int error,
vsnprintf(buffer, sizeof(buffer), fmt, ap);
va_end(ap);
WLog_Print(log, lvl, "%s: error %s[%d]", buffer, libusb_error_name(error), error);
WLog_Print(log, lvl, "[%s:%" PRIuz "]: %s: error %s[%d]", fkt, line, buffer,
libusb_error_name(error), error);
return TRUE;
}
return FALSE;
}
#define log_libusb_result(log, lvl, fmt, error, ...) \
log_libusb_result_((log), (lvl), (fmt), __FUNCTION__, __FILE__, __LINE__, error, ##__VA_ARGS__)
const char* usb_interface_class_to_string(uint8_t class)
{
switch (class)