From 622fcc7025830f3d25fa39a734214afca062b921 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 29 Aug 2024 09:25:07 +0200 Subject: [PATCH] [warnings] fix types and guards Fix some broken define guards and a wrong return type --- libfreerdp/core/gateway/rdg.c | 2 +- winpr/libwinpr/file/generic.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c index 656eba84d..f4683ddea 100644 --- a/libfreerdp/core/gateway/rdg.c +++ b/libfreerdp/core/gateway/rdg.c @@ -1188,7 +1188,7 @@ static BOOL rdg_auth_init(rdpRdg* rdg, rdpTls* tls, TCHAR* authPkg) if (!credssp_auth_init(rdg->auth, authPkg, tls->Bindings)) return FALSE; - bool doSCLogon = freerdp_settings_get_bool(settings, FreeRDP_SmartcardLogon); + BOOL doSCLogon = freerdp_settings_get_bool(settings, FreeRDP_SmartcardLogon); if (doSCLogon) { if (!smartcard_getCert(context, &rdg->smartcard, TRUE)) diff --git a/winpr/libwinpr/file/generic.c b/winpr/libwinpr/file/generic.c index c750739f2..794cfaa13 100644 --- a/winpr/libwinpr/file/generic.c +++ b/winpr/libwinpr/file/generic.c @@ -611,9 +611,10 @@ static const char* flagsToStr(char* buffer, size_t size, DWORD flags) BOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes) { - struct stat st; - int fd = 0; BOOL rc = FALSE; +#ifdef WINPR_HAVE_FCNTL_H + struct stat st = { 0 }; + int fd = 0; if (dwFileAttributes & ~FILE_ATTRIBUTE_READONLY) { @@ -645,6 +646,7 @@ BOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes) rc = TRUE; fail: close(fd); +#endif return rc; }