[vlc-commits] tls: remove tls_Recv() and tls_Send()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 26 13:09:38 2017 +0200| [5cc99219c5694811b78ddd89d28c3e712538eebb] | committer: Rémi Denis-Courmont

tls: remove tls_Recv() and tls_Send()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5cc99219c5694811b78ddd89d28c3e712538eebb
---

 include/vlc_tls.h                                          | 3 ---
 modules/stream_out/chromecast/chromecast_communication.cpp | 2 +-
 src/network/httpd.c                                        | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/vlc_tls.h b/include/vlc_tls.h
index 3f9c118..35c6b51 100644
--- a/include/vlc_tls.h
+++ b/include/vlc_tls.h
@@ -241,9 +241,6 @@ static inline int vlc_tls_Shutdown(vlc_tls_t *tls, bool duplex)
     return tls->shutdown(tls, duplex);
 }
 
-# define tls_Recv(a,b,c) vlc_tls_Read(a,b,c,false)
-# define tls_Send(a,b,c) vlc_tls_Write(a,b,c)
-
 /**
  * Closes a connection and its underlying resources.
  *
diff --git a/modules/stream_out/chromecast/chromecast_communication.cpp b/modules/stream_out/chromecast/chromecast_communication.cpp
index 01b60f7..d880a36 100644
--- a/modules/stream_out/chromecast/chromecast_communication.cpp
+++ b/modules/stream_out/chromecast/chromecast_communication.cpp
@@ -382,7 +382,7 @@ int ChromecastCommunication::sendMessage( const castchannel::CastMessage &msg )
     SetDWBE(p_data, i_size);
     msg.SerializeWithCachedSizesToArray(p_data + PACKET_HEADER_LEN);
 
-    int i_ret = tls_Send(m_tls, p_data, PACKET_HEADER_LEN + i_size);
+    int i_ret = vlc_tls_Write(m_tls, p_data, PACKET_HEADER_LEN + i_size);
     delete[] p_data;
     if (i_ret == PACKET_HEADER_LEN + i_size)
         return VLC_SUCCESS;
diff --git a/src/network/httpd.c b/src/network/httpd.c
index ace040a..26c4bfe 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -1256,7 +1256,7 @@ ssize_t httpd_NetRecv (httpd_client_t *cl, uint8_t *p, size_t i_len)
 
     p_tls = cl->p_tls;
     do
-        val = p_tls ? tls_Recv (p_tls, p, i_len)
+        val = p_tls ? vlc_tls_Read(p_tls, p, i_len, false)
                     : recv (cl->fd, p, i_len, 0);
     while (val == -1 && errno == EINTR);
     return val;
@@ -1270,7 +1270,7 @@ ssize_t httpd_NetSend (httpd_client_t *cl, const uint8_t *p, size_t i_len)
 
     p_tls = cl->p_tls;
     do
-        val = p_tls ? tls_Send(p_tls, p, i_len)
+        val = p_tls ? vlc_tls_Write(p_tls, p, i_len)
                     : send (cl->fd, p, i_len, MSG_NOSIGNAL);
     while (val == -1 && errno == EINTR);
     return val;