[freerdp] Formatting and remove compiler warnings

2 files changed, 40 insertions, 41 deletions

diff --git a/plugins/rdp/rdp_cliprdr.c b/plugins/rdp/rdp_cliprdr.c
index 668d9035a..d42aa356c 100644
--- a/plugins/rdp/rdp_cliprdr.c
+++ b/plugins/rdp/rdp_cliprdr.c
@@ -844,25 +844,24 @@ void remmina_rdp_cliprdr_get_clipboard_data(RemminaProtocolWidget *gp, RemminaPl
 			case CB_FORMAT_HTML:
 			{
 				size = strlen((char *)inbuf);
-				outbuf = lf2crlf(inbuf, &size);
+				outbuf = lf2crlf(inbuf, (int *) &size);
 				break;
 			}
 			case CF_UNICODETEXT:
 			{
 				size = strlen((const char *)inbuf);
-				inbuf = lf2crlf(inbuf, &size);
-				{
+				inbuf = lf2crlf(inbuf, (int *) &size);
 #if FREERDP_VERSION_MAJOR >= 3
-					size_t len = 0;
-					outbuf_wchar = ConvertUtf8NToWCharAlloc((const char *)inbuf, (size_t)size, &len);
-					size = (len + 1) * sizeof(WCHAR);
+				size_t len = 0;
+				outbuf_wchar = ConvertUtf8NToWCharAlloc((const char *)inbuf, (size_t)size, &len);
+				size = (len + 1) * sizeof(WCHAR);
 #else
-					const int rc = (ConvertToUnicode(CP_UTF8, 0, (CHAR *)inbuf, -1, (WCHAR **)&outbuf, 0)) * sizeof(WCHAR);
-					size = 0;
-					if (rc >= 0)
+				const int rc = (ConvertToUnicode(CP_UTF8, 0, (CHAR *)inbuf, -1, (WCHAR **)&outbuf, 0)) * sizeof(WCHAR);
+				size = 0;
+				if (rc >= 0) {
 					size = (size_t)rc;
-#endif
 				}
+#endif
 				g_free(inbuf);
 				break;
 			}
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c
index 141f189b1..85c42c116 100644
--- a/plugins/rdp/rdp_plugin.c
+++ b/plugins/rdp/rdp_plugin.c
@@ -981,37 +981,37 @@ static BOOL remmina_rdp_authenticate_ex(freerdp* instance, char** username, char
 	FreeRDP_Settings_Keys_String cfg_key_domain = FreeRDP_STRING_UNUSED;
 	FreeRDP_Settings_Keys_String cfg_key_password = FreeRDP_STRING_UNUSED;
 	switch(reason) {
-	case AUTH_NLA:
-			case AUTH_TLS:
-			case AUTH_RDP:
-		key_title = _("Enter RDP authentication credentials");
-		key_user = "username";
-		key_domain = "domain";
-		key_password = "password";
-		cfg_key_user = FreeRDP_Username;
-		cfg_key_domain = FreeRDP_Domain;
-		cfg_key_password = FreeRDP_Password;
-		break;
-			case GW_AUTH_HTTP:
-			case GW_AUTH_RDG:
-			case GW_AUTH_RPC:
-		key_title = _("Enter RDP gateway authentication credentials");
-		key_user = "gateway_username";
-		key_domain = "gateway_domain";
-		key_password = "gateway_password";
-		cfg_key_user = FreeRDP_GatewayUsername;
-				cfg_key_domain = FreeRDP_GatewayDomain;
-				cfg_key_password = FreeRDP_GatewayPassword;
-		break;
-	case AUTH_SMARTCARD_PIN:
-		key_title = _("Enter RDP SmartCard PIN");
-		key_password = "smartcard_pin";
-		flags = 0;
-		break;
-	default:
-		// TODO: Display an error dialog informing the user that the remote requires some mechanism FreeRDP or Remmina currently do not support
-		g_fprintf(stderr, "[authentication] unsupported type %d, access denied", reason);
-		return FALSE;
+		case AUTH_NLA:
+		case AUTH_TLS:
+		case AUTH_RDP:
+			key_title = _("Enter RDP authentication credentials");
+			key_user = "username";
+			key_domain = "domain";
+			key_password = "password";
+			cfg_key_user = FreeRDP_Username;
+			cfg_key_domain = FreeRDP_Domain;
+			cfg_key_password = FreeRDP_Password;
+			break;
+		case GW_AUTH_HTTP:
+		case GW_AUTH_RDG:
+		case GW_AUTH_RPC:
+			key_title = _("Enter RDP gateway authentication credentials");
+			key_user = "gateway_username";
+			key_domain = "gateway_domain";
+			key_password = "gateway_password";
+			cfg_key_user = FreeRDP_GatewayUsername;
+			cfg_key_domain = FreeRDP_GatewayDomain;
+			cfg_key_password = FreeRDP_GatewayPassword;
+			break;
+		case AUTH_SMARTCARD_PIN:
+			key_title = _("Enter RDP SmartCard PIN");
+			key_password = "smartcard_pin";
+			flags = 0;
+			break;
+		default:
+			// TODO: Display an error dialog informing the user that the remote requires some mechanism FreeRDP or Remmina currently do not support
+			g_fprintf(stderr, "[authentication] unsupported type %d, access denied", reason);
+			return FALSE;
 	}
 
 	if (!disablepasswordstoring)