From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 11 Jun 2008 18:08:17 +0000 (+0200)
Subject: Make ssl_check_error static and define ssl_type always.
X-Git-Tag: v3.0.32~4
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=29ae3278722e4a61905cc5d330fc2d286d2e7016;p=yaz-moved-to-github.git

Make ssl_check_error static and define ssl_type always.

Make ssl_check_error static becuase it's a private function.
Define function ssl_type always - also in case SSL is disabled - and
make it return 0 (NULL ptr).
---

diff --git a/src/tcpip.c b/src/tcpip.c
index ae070d7..6cb4bbe 100644
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -241,10 +241,11 @@ COMSTACK yaz_tcpip_create(int s, int flags, int protocol,
 }
 
 
-#if ENABLE_SSL
-
 COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
 {
+#if !ENABLE_SSL
+    return 0;
+#else
     tcpip_state *sp;
     COMSTACK p;
 
@@ -260,9 +261,11 @@ COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
 
     /* note: we don't handle already opened socket in SSL mode - yet */
     return p;
+#endif
 }
 
-int ssl_check_error(COMSTACK h, tcpip_state *sp, int res)
+#if !ENABLE_SSL
+static int ssl_check_error(COMSTACK h, tcpip_state *sp, int res)
 {
 #if HAVE_OPENSSL_SSL_H
     int err = SSL_get_error(sp->ssl, res);