Make private functions static in unix.c

[yaz-moved-to-github.git] / comstack / unix.c

diff --git a/comstack/unix.c b/comstack/unix.c
index edfa830..235c9b1 100644 (file)
--- a/comstack/unix.c
+++ b/comstack/unix.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: unix.c,v 1.5 2002-09-10 20:56:34 adam Exp $
+ * $Id: unix.c,v 1.8 2002-12-15 21:22:58 adam Exp $
  * UNIX socket COMSTACK. By Morten Bøgeskov.
  */
 #ifndef WIN32
@@ -26,32 +26,26 @@
 /* Chas added the following, so we get the definition of completeBER */
 #include <yaz/odr.h>
 
-#if HAVE_SOCKLEN_T
-#define NET_LEN_T socklen_t
-#else
-#if GETPEERNAME_ACCEPTS_SIZE_T_FOR_THIRD_ARGUMENT
-#define NET_LEN_T size_t
-#else
-#define NET_LEN_T int
-#endif
+#ifndef YAZ_SOCKLEN_T
+#define YAZ_SOCKLEN_T int
 #endif
 
-int unix_close(COMSTACK h);
-int unix_put(COMSTACK h, char *buf, int size);
-int unix_get(COMSTACK h, char **buf, int *bufsize);
-int unix_connect(COMSTACK h, void *address);
-int unix_more(COMSTACK h);
-int unix_rcvconnect(COMSTACK h);
-int unix_bind(COMSTACK h, void *address, int mode);
-int unix_listen(COMSTACK h, char *raddr, int *addrlen,
+static int unix_close(COMSTACK h);
+static int unix_put(COMSTACK h, char *buf, int size);
+static int unix_get(COMSTACK h, char **buf, int *bufsize);
+static int unix_connect(COMSTACK h, void *address);
+static int unix_more(COMSTACK h);
+static int unix_rcvconnect(COMSTACK h);
+static int unix_bind(COMSTACK h, void *address, int mode);
+static int unix_listen(COMSTACK h, char *raddr, int *addrlen,
                int (*check_ip)(void *cd, const char *a, int len, int type),
                void *cd);
-int static unix_set_blocking(COMSTACK p, int blocking);
+static int unix_set_blocking(COMSTACK p, int blocking);
 
 
-COMSTACK unix_accept(COMSTACK h);
-char *unix_addrstr(COMSTACK h);
-void *unix_straddr(COMSTACK h, const char *str);
+static COMSTACK unix_accept(COMSTACK h);
+static char *unix_addrstr(COMSTACK h);
+static void *unix_straddr(COMSTACK h, const char *str);
 
 #ifndef SUN_LEN
 #define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
@@ -155,7 +149,7 @@ COMSTACK unix_type(int s, int blocking, int protocol, void *vp)
 }
 
 
-int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add)
+static int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add)
 {
     char *cp;
     if (!unix_init ())
@@ -169,7 +163,7 @@ int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add)
     return 1;
 }
 
-void *unix_straddr(COMSTACK h, const char *str)
+static void *unix_straddr(COMSTACK h, const char *str)
 {
     unix_state *sp = (unix_state *)h->cprivate;
 
@@ -191,7 +185,7 @@ struct sockaddr_un *unix_strtoaddr(const char *str)
     return &add;
 }
 
-int unix_more(COMSTACK h)
+static int unix_more(COMSTACK h)
 {
     unix_state *sp = (unix_state *)h->cprivate;
 
@@ -204,7 +198,7 @@ int unix_more(COMSTACK h)
  * weird things like spawning subprocesses or threading or some weird junk
  * like that.
  */
-int unix_connect(COMSTACK h, void *address)
+static int unix_connect(COMSTACK h, void *address)
 {
     struct sockaddr_un *add = (struct sockaddr_un *)address;
     int r;
@@ -219,7 +213,7 @@ int unix_connect(COMSTACK h, void *address)
     r = connect(h->iofile, (struct sockaddr *) add, SUN_LEN(add));
     if (r < 0)
     {
-       if (errno == EINPROGRESS)
+       if (yaz_errno() == EINPROGRESS)
        {
            h->event = CS_CONNECT;
            h->state = CS_ST_CONNECTING;
@@ -238,7 +232,7 @@ int unix_connect(COMSTACK h, void *address)
 /*
  * nop
  */
-int unix_rcvconnect(COMSTACK h)
+static int unix_rcvconnect(COMSTACK h)
 {
     TRC(fprintf(stderr, "unix_rcvconnect\n"));
 
@@ -257,7 +251,7 @@ int unix_rcvconnect(COMSTACK h)
 #define CERTF "ztest.pem"
 #define KEYF "ztest.pem"
 
-int unix_bind(COMSTACK h, void *address, int mode)
+static int unix_bind(COMSTACK h, void *address, int mode)
 {
     struct sockaddr *addr = (struct sockaddr *)address;
     const char * path = ((struct sockaddr_un *)addr)->sun_path;
@@ -270,7 +264,7 @@ int unix_bind(COMSTACK h, void *address, int mode)
        int socket_out = -1;
        if(! S_ISSOCK(stat_buf.st_mode)) {
            h->cerrno = CSYSERR;
-           errno = EEXIST; /* Not a socket (File exists) */
+           yaz_set_errno(EEXIST); /* Not a socket (File exists) */
            return -1;
        }
        if((socket_out = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
@@ -280,7 +274,7 @@ int unix_bind(COMSTACK h, void *address, int mode)
        socket_unix.sun_family = AF_UNIX;
        strncpy(socket_unix.sun_path, path, sizeof(socket_unix.sun_path));
        if(connect(socket_out, (struct sockaddr *) &socket_unix, SUN_LEN(&socket_unix)) < 0) {
-           if(errno == ECONNREFUSED) {
+           if(yaz_errno() == ECONNREFUSED) {
                TRC (fprintf (stderr, "Socket exists but nobody is listening\n"));
            } else {
                h->cerrno = CSYSERR;
@@ -289,7 +283,7 @@ int unix_bind(COMSTACK h, void *address, int mode)
        } else {
            close(socket_out);
            h->cerrno = CSYSERR;
-           errno = EADDRINUSE;
+           yaz_set_errno(EADDRINUSE);
            return -1;
        }
        unlink(path);
@@ -310,12 +304,12 @@ int unix_bind(COMSTACK h, void *address, int mode)
     return 0;
 }
 
-int unix_listen(COMSTACK h, char *raddr, int *addrlen,
-               int (*check_ip)(void *cd, const char *a, int len, int t),
-               void *cd)
+static int unix_listen(COMSTACK h, char *raddr, int *addrlen,
+                    int (*check_ip)(void *cd, const char *a, int len, int t),
+                   void *cd)
 {
     struct sockaddr_un addr;
-    NET_LEN_T len = SUN_LEN(&addr);
+    YAZ_SOCKLEN_T len = SUN_LEN(&addr);
 
     TRC(fprintf(stderr, "unix_listen pid=%d\n", getpid()));
     if (h->state != CS_ST_IDLE)
@@ -327,10 +321,10 @@ int unix_listen(COMSTACK h, char *raddr, int *addrlen,
     if (h->newfd < 0)
     {
        if (
-           errno == EWOULDBLOCK
+           yaz_errno() == EWOULDBLOCK
 #ifdef EAGAIN
 #if EAGAIN != EWOULDBLOCK
-           || errno == EAGAIN
+           || yaz_errno() == EAGAIN
 #endif
 #endif
            )
@@ -347,7 +341,7 @@ int unix_listen(COMSTACK h, char *raddr, int *addrlen,
     return 0;
 }
 
-COMSTACK unix_accept(COMSTACK h)
+static COMSTACK unix_accept(COMSTACK h)
 {
     COMSTACK cnew;
     unix_state *state, *st = (unix_state *)h->cprivate;
@@ -421,7 +415,7 @@ COMSTACK unix_accept(COMSTACK h)
  * Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer,
  * 0=connection closed.
  */
-int unix_get(COMSTACK h, char **buf, int *bufsize)
+static int unix_get(COMSTACK h, char **buf, int *bufsize)
 {
     unix_state *sp = (unix_state *)h->cprivate;
     char *tmpc;
@@ -457,19 +451,19 @@ int unix_get(COMSTACK h, char **buf, int *bufsize)
        TRC(fprintf(stderr, "  recv res=%d, hasread=%d\n", res, hasread));
        if (res < 0)
        {
-           if (errno == EWOULDBLOCK
+           if (yaz_errno() == EWOULDBLOCK
 #ifdef EAGAIN
 #if EAGAIN != EWOULDBLOCK
-               || errno == EAGAIN
+               || yaz_errno() == EAGAIN
 #endif
 #endif
-               || errno == EINPROGRESS
+               || yaz_errno() == EINPROGRESS
                )
            {
                h->io_pending = CS_WANT_READ;
                break;
            }
-           else if (errno == 0)
+           else if (yaz_errno() == 0)
                continue;
            else
                return -1;
@@ -510,7 +504,7 @@ int unix_get(COMSTACK h, char **buf, int *bufsize)
  * In nonblocking mode, you must call again with same buffer while
  * return value is 1.
  */
-int unix_put(COMSTACK h, char *buf, int size)
+static int unix_put(COMSTACK h, char *buf, int size)
 {
     int res;
     struct unix_state *state = (struct unix_state *)h->cprivate;
@@ -541,10 +535,10 @@ int unix_put(COMSTACK h, char *buf, int size)
                 )) < 0)
        {
            if (
-               errno == EWOULDBLOCK
+               yaz_errno() == EWOULDBLOCK
 #ifdef EAGAIN
 #if EAGAIN != EWOULDBLOCK
-               || errno == EAGAIN
+               || yaz_errno() == EAGAIN
 #endif
 #endif
                )
@@ -565,9 +559,7 @@ int unix_put(COMSTACK h, char *buf, int size)
     return 0;
 }
 
-
-
-int unix_close(COMSTACK h)
+static int unix_close(COMSTACK h)
 {
     unix_state *sp = (struct unix_state *)h->cprivate;
 
@@ -583,7 +575,7 @@ int unix_close(COMSTACK h)
     return 0;
 }
 
-char *unix_addrstr(COMSTACK h)
+static char *unix_addrstr(COMSTACK h)
 {
     unix_state *sp = (struct unix_state *)h->cprivate;
     char *buf = sp->buf;
@@ -591,7 +583,7 @@ char *unix_addrstr(COMSTACK h)
     return buf;
 }
 
-int static unix_set_blocking(COMSTACK p, int blocking)
+static int unix_set_blocking(COMSTACK p, int blocking)
 {
     unsigned long flag;