[vlc-commits] tls: drop unused vlc_tls_SocketOpen() parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 25 19:38:34 2017 +0200| [074d87769266efa4ffda57e7251da409144e46cd] | committer: Rémi Denis-Courmont

tls: drop unused vlc_tls_SocketOpen() parameter

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

 include/vlc_tls.h                 | 4 ++--
 modules/access/http/h1conn_test.c | 2 +-
 modules/access/http/h2conn_test.c | 2 +-
 src/network/tls.c                 | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/vlc_tls.h b/include/vlc_tls.h
index 81772a6..623436f 100644
--- a/include/vlc_tls.h
+++ b/include/vlc_tls.h
@@ -230,7 +230,7 @@ VLC_API void vlc_tls_Delete (vlc_tls_creds_t *);
  *
  * This function is not a cancellation point.
  */
-VLC_API vlc_tls_t *vlc_tls_SocketOpen(vlc_object_t *obj, int fd);
+VLC_API vlc_tls_t *vlc_tls_SocketOpen(int fd);
 
 struct addrinfo;
 
@@ -257,7 +257,7 @@ static inline vlc_tls_t *
 vlc_tls_ClientSessionCreateFD(vlc_tls_creds_t *crd, int fd, const char *host,
                               const char *srv, const char *const *lp, char **p)
 {
-    vlc_tls_t *sock = vlc_tls_SocketOpen(VLC_OBJECT(crd), fd);
+    vlc_tls_t *sock = vlc_tls_SocketOpen(fd);
     if (unlikely(sock == NULL))
         return NULL;
 
diff --git a/modules/access/http/h1conn_test.c b/modules/access/http/h1conn_test.c
index a6f8222..3979c5f 100644
--- a/modules/access/http/h1conn_test.c
+++ b/modules/access/http/h1conn_test.c
@@ -47,7 +47,7 @@ static void conn_create(void)
     if (vlc_socketpair(PF_LOCAL, SOCK_STREAM, 0, fds, false))
         assert(!"socketpair");
 
-    struct vlc_tls *tls = vlc_tls_SocketOpen(NULL, fds[1]);
+    struct vlc_tls *tls = vlc_tls_SocketOpen(fds[1]);
     assert(tls != NULL);
 
     external_fd = fds[0];
diff --git a/modules/access/http/h2conn_test.c b/modules/access/http/h2conn_test.c
index 308529d..5a40a7e 100644
--- a/modules/access/http/h2conn_test.c
+++ b/modules/access/http/h2conn_test.c
@@ -93,7 +93,7 @@ static void conn_create(void)
     if (vlc_socketpair(PF_LOCAL, SOCK_STREAM, 0, fds, false))
         assert(!"socketpair");
 
-    struct vlc_tls *tls = vlc_tls_SocketOpen(NULL, fds[1]);
+    struct vlc_tls *tls = vlc_tls_SocketOpen(fds[1]);
     assert(tls != NULL);
 
     external_fd = fds[0];
diff --git a/src/network/tls.c b/src/network/tls.c
index e7b4c47..286c70c 100644
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -211,7 +211,7 @@ error:
 vlc_tls_t *vlc_tls_ServerSessionCreate(vlc_tls_creds_t *crd, int fd,
                                        const char *const *alpn)
 {
-    vlc_tls_t *sock = vlc_tls_SocketOpen(VLC_OBJECT(crd), fd);
+    vlc_tls_t *sock = vlc_tls_SocketOpen(fd);
     if (unlikely(sock == NULL))
         return NULL;
 
@@ -372,7 +372,7 @@ static void vlc_tls_SocketClose(vlc_tls_t *tls)
     free(tls);
 }
 
-vlc_tls_t *vlc_tls_SocketOpen(vlc_object_t *obj, int fd)
+vlc_tls_t *vlc_tls_SocketOpen(int fd)
 {
     vlc_tls_socket_t *sock = malloc(sizeof (*sock));
     if (unlikely(sock == NULL))
@@ -443,7 +443,7 @@ static vlc_tls_t *vlc_tls_SocketOpenAddrInfoSingle(vlc_object_t *obj,
         }
     }
 
-    vlc_tls_t *tls = vlc_tls_SocketOpen(obj, fd);
+    vlc_tls_t *tls = vlc_tls_SocketOpen(fd);
     if (unlikely(tls == NULL))
         goto giveup;