From 47dd22ba87a0e1807c8f72d6e61c14b1d4ae1c2d Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
Date: Tue, 22 Jul 2014 11:19:38 +0200
Subject: [PATCH] transport refactor

rename transport_read to transport_read_pdu. This name is more
descriptive what the function actually does.
---
 libfreerdp/core/nego.c      | 2 +-
 libfreerdp/core/nla.c       | 2 +-
 libfreerdp/core/transport.c | 4 ++--
 libfreerdp/core/transport.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c
index c250b4be9..09d63065a 100644
--- a/libfreerdp/core/nego.c
+++ b/libfreerdp/core/nego.c
@@ -503,7 +503,7 @@ BOOL nego_recv_response(rdpNego* nego)
 	if (!s)
 		return FALSE;
 
-	status = transport_read(nego->transport, s);
+	status = transport_read_pdu(nego->transport, s);
 	if (status < 0)
 	{
 		Stream_Free(s, TRUE);
diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
index f1573a5a0..22df71edb 100644
--- a/libfreerdp/core/nla.c
+++ b/libfreerdp/core/nla.c
@@ -1198,7 +1198,7 @@ int credssp_recv(rdpCredssp* credssp)
 
 	s = Stream_New(NULL, 4096);
 
-	status = transport_read(credssp->transport, s);
+	status = transport_read_pdu(credssp->transport, s);
 	Stream_Length(s) = status;
 
 	if (status < 0)
diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c
index 3f214e5ad..476930c8b 100644
--- a/libfreerdp/core/transport.c
+++ b/libfreerdp/core/transport.c
@@ -721,7 +721,7 @@ int transport_read_layer(rdpTransport* transport, BYTE* data, int bytes)
 	return read;
 }
 
-int transport_read(rdpTransport* transport, wStream* s)
+int transport_read_pdu(rdpTransport* transport, wStream* s)
 {
 	int status;
 	int position;
@@ -847,7 +847,7 @@ static int transport_read_nonblocking(rdpTransport* transport)
 {
 	int status;
 
-	status = transport_read(transport, transport->ReceiveBuffer);
+	status = transport_read_pdu(transport, transport->ReceiveBuffer);
 
 	if (status <= 0)
 		return status;
diff --git a/libfreerdp/core/transport.h b/libfreerdp/core/transport.h
index 3a4a41753..142d350f3 100644
--- a/libfreerdp/core/transport.h
+++ b/libfreerdp/core/transport.h
@@ -96,7 +96,7 @@ BOOL transport_accept_rdp(rdpTransport* transport);
 BOOL transport_accept_tls(rdpTransport* transport);
 BOOL transport_accept_nla(rdpTransport* transport);
 void transport_stop(rdpTransport* transport);
-int transport_read(rdpTransport* transport, wStream* s);
+int transport_read_pdu(rdpTransport* transport, wStream* s);
 int transport_write(rdpTransport* transport, wStream* s);
 void transport_get_fds(rdpTransport* transport, void** rfds, int* rcount);
 int transport_check_fds(rdpTransport* transport);