From 70aed3fa855dc39afc83da26a9a482eedaf7177c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Fri, 8 Nov 2013 13:57:41 -0500 Subject: [PATCH] libfreerdp-core: minor style cleanup --- libfreerdp/core/tpdu.c | 8 ++++---- libfreerdp/core/tpdu.h | 8 ++++---- libfreerdp/core/transport.c | 2 +- winpr/libwinpr/utils/stream.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libfreerdp/core/tpdu.c b/libfreerdp/core/tpdu.c index 30a649c22..e9b3ba35b 100644 --- a/libfreerdp/core/tpdu.c +++ b/libfreerdp/core/tpdu.c @@ -121,11 +121,11 @@ void tpdu_write_header(wStream* s, UINT16 length, BYTE code) * @return length indicator (LI) */ -BOOL tpdu_read_connection_request(wStream* s, BYTE *li) +BOOL tpdu_read_connection_request(wStream* s, BYTE* li) { BYTE code; - if(!tpdu_read_header(s, &code, li)) + if (!tpdu_read_header(s, &code, li)) return FALSE; if (code != X224_TPDU_CONNECTION_REQUEST) @@ -154,11 +154,11 @@ void tpdu_write_connection_request(wStream* s, UINT16 length) * @return length indicator (LI) */ -BOOL tpdu_read_connection_confirm(wStream* s, BYTE *li) +BOOL tpdu_read_connection_confirm(wStream* s, BYTE* li) { BYTE code; - if(!tpdu_read_header(s, &code, li)) + if (!tpdu_read_header(s, &code, li)) return FALSE; if (code != X224_TPDU_CONNECTION_CONFIRM) diff --git a/libfreerdp/core/tpdu.h b/libfreerdp/core/tpdu.h index dbd0fe53d..87799f206 100644 --- a/libfreerdp/core/tpdu.h +++ b/libfreerdp/core/tpdu.h @@ -41,14 +41,14 @@ enum X224_TPDU_TYPE #define TPDU_CONNECTION_CONFIRM_LENGTH (TPKT_HEADER_LENGTH + TPDU_CONNECTION_CONFIRM_HEADER_LENGTH) #define TPDU_DISCONNECT_REQUEST_LENGTH (TPKT_HEADER_LENGTH + TPDU_DISCONNECT_REQUEST_HEADER_LENGTH) -BOOL tpdu_read_header(wStream* s, BYTE* code, BYTE *li); +BOOL tpdu_read_header(wStream* s, BYTE* code, BYTE* li); void tpdu_write_header(wStream* s, UINT16 length, BYTE code); -BOOL tpdu_read_connection_request(wStream* s, BYTE *li); +BOOL tpdu_read_connection_request(wStream* s, BYTE* li); void tpdu_write_connection_request(wStream* s, UINT16 length); -BOOL tpdu_read_connection_confirm(wStream* s, BYTE *li); +BOOL tpdu_read_connection_confirm(wStream* s, BYTE* li); void tpdu_write_connection_confirm(wStream* s, UINT16 length); void tpdu_write_disconnect_request(wStream* s, UINT16 length); -BOOL tpdu_read_data(wStream* s, UINT16 *li); +BOOL tpdu_read_data(wStream* s, UINT16* li); void tpdu_write_data(wStream* s); #endif /* __TPDU_H */ diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index d95d78f57..fd7b1b2dc 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -573,7 +573,7 @@ int transport_read(rdpTransport* transport, wStream* s) position += status; } - Stream_Peek(s, header, 4); /* peek at first 4 bytes */ + CopyMemory(header, Stream_Buffer(s), 4); /* peek at first 4 bytes */ /* if header is present, read in exactly one PDU */ if (header[0] == 0x03) diff --git a/winpr/libwinpr/utils/stream.c b/winpr/libwinpr/utils/stream.c index cae3b401e..bce25f541 100644 --- a/winpr/libwinpr/utils/stream.c +++ b/winpr/libwinpr/utils/stream.c @@ -67,7 +67,7 @@ wStream* Stream_New(BYTE* buffer, size_t size) s = malloc(sizeof(wStream)); - if (s != NULL) + if (s) { if (buffer) s->buffer = buffer; @@ -87,11 +87,11 @@ wStream* Stream_New(BYTE* buffer, size_t size) void Stream_Free(wStream* s, BOOL bFreeBuffer) { - if (s != NULL) + if (s) { if (bFreeBuffer) { - if (s->buffer != NULL) + if (s->buffer) free(s->buffer); }