libfreerdp-core: fix code style

diff --git a/client/Windows/wf_client.c b/client/Windows/wf_client.c
index 65eb81a..e9af71f 100644 (file)
--- a/client/Windows/wf_client.c
+++ b/client/Windows/wf_client.c
@@ -575,8 +575,7 @@ static BOOL wf_gw_authenticate(freerdp* instance,
                char** username, char** password, char** domain)
 {
        char tmp[MAX_PATH];
-
-       sprintf(tmp, sizeof(tmp), "Gateway %s", instance->settings->GatewayHostname);
+       sprintf_s(tmp, sizeof(tmp), "Gateway %s", instance->settings->GatewayHostname);
        return wf_authenticate_raw(instance, tmp, username, password, domain);
 }
 

diff --git a/libfreerdp/core/gateway/rdg.c b/libfreerdp/core/gateway/rdg.c
index 6e73f9f..991786b 100644 (file)
--- a/libfreerdp/core/gateway/rdg.c
+++ b/libfreerdp/core/gateway/rdg.c
@@ -325,6 +325,7 @@ wStream* rdg_build_http_request(rdpRdg* rdg, char* method)
 
        if (s)
                Stream_SealLength(s);
+
        return s;
 }
 
@@ -379,9 +380,7 @@ BOOL rdg_process_out_channel_response(rdpRdg* rdg, HttpResponse* response)
        rdg->ntlm = NULL;
 
        if (status < 0)
-       {
                return FALSE;
-       }
 
        rdg->state = RDG_CLIENT_STATE_OUT_CHANNEL_AUTHORIZE;
 
@@ -446,9 +445,7 @@ BOOL rdg_process_in_channel_response(rdpRdg* rdg, HttpResponse* response)
        rdg->ntlm = NULL;
 
        if (status < 0)
-       {
                return FALSE;
-       }
 
        rdg->state = RDG_CLIENT_STATE_IN_CHANNEL_AUTHORIZE;
 
@@ -475,12 +472,12 @@ BOOL rdg_process_in_channel_authorization(rdpRdg* rdg, HttpResponse* response)
                return FALSE;
 
        status = tls_write_all(rdg->tlsIn, Stream_Buffer(s), Stream_Length(s));
-    if (status <= 0)
-    {
-        return FALSE;
-    }
+       
        Stream_Free(s, TRUE);
 
+       if (status <= 0)
+               return FALSE;
+
        return TRUE;
 }
 
@@ -1167,62 +1164,62 @@ int rdg_write_data_packet(rdpRdg* rdg, BYTE* buf, int size)
 
 BOOL rdg_process_close_packet(rdpRdg* rdg)
 {
-    int status;
-    wStream* sChunk;
-    int packetSize = 12;
-    char chunkSize[11];
+       int status;
+       wStream* sChunk;
+       int packetSize = 12;
+       char chunkSize[11];
     
-    sprintf_s(chunkSize, sizeof(chunkSize), "%X\r\n", packetSize);
+       sprintf_s(chunkSize, sizeof(chunkSize), "%X\r\n", packetSize);
     
-    sChunk = Stream_New(NULL, strlen(chunkSize) + packetSize + 2);
+       sChunk = Stream_New(NULL, strlen(chunkSize) + packetSize + 2);
     
-    if (!sChunk)
-        return FALSE;
+       if (!sChunk)
+               return FALSE;
     
-    Stream_Write(sChunk, chunkSize, strlen(chunkSize));
+       Stream_Write(sChunk, chunkSize, strlen(chunkSize));
     
-    Stream_Write_UINT16(sChunk, PKT_TYPE_CLOSE_CHANNEL_RESPONSE);   /* Type */
-    Stream_Write_UINT16(sChunk, 0);   /* Reserved */
-    Stream_Write_UINT32(sChunk, packetSize);   /* Packet length */
+       Stream_Write_UINT16(sChunk, PKT_TYPE_CLOSE_CHANNEL_RESPONSE);   /* Type */
+       Stream_Write_UINT16(sChunk, 0);   /* Reserved */
+       Stream_Write_UINT32(sChunk, packetSize);   /* Packet length */
     
-    Stream_Write_UINT32(sChunk, 0);   /* Status code */
+       Stream_Write_UINT32(sChunk, 0);   /* Status code */
     
-    Stream_Write(sChunk, "\r\n", 2);
-    Stream_SealLength(sChunk);
+       Stream_Write(sChunk, "\r\n", 2);
+       Stream_SealLength(sChunk);
     
-    status = tls_write_all(rdg->tlsIn, Stream_Buffer(sChunk), Stream_Length(sChunk));
-    Stream_Free(sChunk, TRUE);
+       status = tls_write_all(rdg->tlsIn, Stream_Buffer(sChunk), Stream_Length(sChunk));
+       Stream_Free(sChunk, TRUE);
     
-    return (status < 0 ? FALSE : TRUE);
+       return (status < 0 ? FALSE : TRUE);
 }
 
 BOOL rdg_process_keep_alive_packet(rdpRdg* rdg)
 {
-    int status;
-    wStream* sChunk;
-    int packetSize = 8;
-    char chunkSize[11];
+       int status;
+       wStream* sChunk;
+       int packetSize = 8;
+       char chunkSize[11];
     
-    sprintf_s(chunkSize, sizeof(chunkSize), "%X\r\n", packetSize);
+       sprintf_s(chunkSize, sizeof(chunkSize), "%X\r\n", packetSize);
     
-    sChunk = Stream_New(NULL, strlen(chunkSize) + packetSize + 2);
+       sChunk = Stream_New(NULL, strlen(chunkSize) + packetSize + 2);
     
-    if (!sChunk)
-        return FALSE;
+       if (!sChunk)
+               return FALSE;
     
-    Stream_Write(sChunk, chunkSize, strlen(chunkSize));
+       Stream_Write(sChunk, chunkSize, strlen(chunkSize));
     
-    Stream_Write_UINT16(sChunk, PKT_TYPE_KEEPALIVE);   /* Type */
-    Stream_Write_UINT16(sChunk, 0);   /* Reserved */
-    Stream_Write_UINT32(sChunk, packetSize);   /* Packet length */
+       Stream_Write_UINT16(sChunk, PKT_TYPE_KEEPALIVE);   /* Type */
+       Stream_Write_UINT16(sChunk, 0);   /* Reserved */
+       Stream_Write_UINT32(sChunk, packetSize);   /* Packet length */
     
-    Stream_Write(sChunk, "\r\n", 2);
-    Stream_SealLength(sChunk);
+       Stream_Write(sChunk, "\r\n", 2);
+       Stream_SealLength(sChunk);
     
-    status = tls_write_all(rdg->tlsIn, Stream_Buffer(sChunk), Stream_Length(sChunk));
-    Stream_Free(sChunk, TRUE);
+       status = tls_write_all(rdg->tlsIn, Stream_Buffer(sChunk), Stream_Length(sChunk));
+       Stream_Free(sChunk, TRUE);
     
-    return (status < 0 ? FALSE : TRUE);
+       return (status < 0 ? FALSE : TRUE);
 }
 
 BOOL rdg_process_unknown_packet(rdpRdg* rdg, int type)
@@ -1242,10 +1239,9 @@ BOOL rdg_process_control_packet(rdpRdg* rdg, int type, int packetLength)
        if (payloadSize)
        {
                s = Stream_New(NULL, payloadSize);
+
                if (!s)
-               {
                        return FALSE;
-               }
 
                while (readCount < payloadSize)
                {
@@ -1268,21 +1264,21 @@ BOOL rdg_process_control_packet(rdpRdg* rdg, int type, int packetLength)
 
        switch (type)
        {
-       case PKT_TYPE_CLOSE_CHANNEL:
-        EnterCriticalSection(&rdg->writeSection);
-               status = rdg_process_close_packet(rdg);
-        LeaveCriticalSection(&rdg->writeSection);
-        break;
-
-    case PKT_TYPE_KEEPALIVE:
-        EnterCriticalSection(&rdg->writeSection);
-        status = rdg_process_keep_alive_packet(rdg);
-        LeaveCriticalSection(&rdg->writeSection);
-        break;
+               case PKT_TYPE_CLOSE_CHANNEL:
+                       EnterCriticalSection(&rdg->writeSection);
+                       status = rdg_process_close_packet(rdg);
+                       LeaveCriticalSection(&rdg->writeSection);
+                       break;
+
+               case PKT_TYPE_KEEPALIVE:
+                       EnterCriticalSection(&rdg->writeSection);
+                       status = rdg_process_keep_alive_packet(rdg);
+                       LeaveCriticalSection(&rdg->writeSection);
+                       break;
             
-       default:
-               status = rdg_process_unknown_packet(rdg, type);
-               break;
+               default:
+                       status = rdg_process_unknown_packet(rdg, type);
+                       break;
        }
 
        Stream_Free(s, TRUE);
@@ -1359,7 +1355,7 @@ int rdg_read_data_packet(rdpRdg* rdg, BYTE* buffer, int size)
                {
                        return -1;
                }
-        return 0;
+               return 0;
        }
 
        rdg->packetRemainingCount -= status;
@@ -1386,9 +1382,9 @@ static int rdg_bio_write(BIO* bio, const char* buf, int num)
 
        BIO_clear_flags(bio, BIO_FLAGS_WRITE);
 
-    EnterCriticalSection(&rdg->writeSection);
+       EnterCriticalSection(&rdg->writeSection);
        status = rdg_write_data_packet(rdg, (BYTE*) buf, num);
-    LeaveCriticalSection(&rdg->writeSection);
+       LeaveCriticalSection(&rdg->writeSection);
 
        if (status < 0)
        {
@@ -1411,18 +1407,18 @@ static int rdg_bio_write(BIO* bio, const char* buf, int num)
 static int rdg_bio_read(BIO* bio, char* buf, int size)
 {
        int status;
-       rdpRdg* rdg = (rdpRdg*)bio->ptr;
+       rdpRdg* rdg = (rdpRdg*) bio->ptr;
 
        status = rdg_read_data_packet(rdg, (BYTE*) buf, size);
 
-    if (!status)
-    {
-        BIO_set_retry_read(bio);
-        return -1;
-    }
+       if (!status)
+       {
+               BIO_set_retry_read(bio);
+               return -1;
+       }
        else if (status < 0)
        {
-        BIO_clear_retry_flags(bio);
+               BIO_clear_retry_flags(bio);
                return -1;
        }
 
@@ -1588,7 +1584,7 @@ rdpRdg* rdg_new(rdpTransport* transport)
                if (!rdg->readEvent)
                        goto rdg_alloc_error;
         
-        InitializeCriticalSection(&rdg->writeSection);
+               InitializeCriticalSection(&rdg->writeSection);
        }
 
        return rdg;
@@ -1633,7 +1629,7 @@ void rdg_free(rdpRdg* rdg)
                rdg->readEvent = NULL;
        }
     
-    DeleteCriticalSection(&rdg->writeSection);
+       DeleteCriticalSection(&rdg->writeSection);
 
        free(rdg);
 }

diff --git a/libfreerdp/core/gateway/rdg.h b/libfreerdp/core/gateway/rdg.h
index d652371..25890e2 100644 (file)
--- a/libfreerdp/core/gateway/rdg.h
+++ b/libfreerdp/core/gateway/rdg.h
@@ -132,7 +132,7 @@ struct rdp_rdg
        rdpNtlm* ntlm;
        HttpContext* http;
        HANDLE readEvent;
-    CRITICAL_SECTION writeSection;
+       CRITICAL_SECTION writeSection;
 
        UUID guid;
 

diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
index 47fda02..30a5bc4 100644 (file)
--- a/libfreerdp/crypto/tls.c
+++ b/libfreerdp/crypto/tls.c
@@ -159,11 +159,11 @@ static int bio_rdp_tls_read(BIO* bio, char* buf, int size)
                                break;
 
                        case SSL_ERROR_SYSCALL:
-                if (WSAGetLastError() == WSAEWOULDBLOCK)
-                {
-                    BIO_set_flags(bio, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY);
-                    break;
-                }
+                               if (WSAGetLastError() == WSAEWOULDBLOCK)
+                               {
+                                       BIO_set_flags(bio, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY);
+                                       break;
+                               }
                                BIO_clear_flags(bio, BIO_FLAGS_SHOULD_RETRY);
                                break;
                }