Improved installation. Moved header files to include/yaz.

[yaz-moved-to-github.git] / server / eventl.c

diff --git a/server/eventl.c b/server/eventl.c
index 76a80be..6ad0ef3 100644 (file)
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.25  1998-01-29 13:30:23  adam
+ * Revision 1.29  1999-11-30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.28  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.27  1999/02/02 13:57:34  adam
+ * Uses preprocessor define WIN32 instead of WINDOWS to build code
+ * for Microsoft WIN32.
+ *
+ * Revision 1.26  1998/02/11 11:53:35  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.25  1998/01/29 13:30:23  adam
  * Better event handle system for NT/Unix.
  *
  * Revision 1.24  1997/09/04 14:19:13  adam
@@ -84,10 +97,9 @@
  *
  */
 
-#include <yconfig.h>
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <winsock.h>
 #else
 #include <unistd.h>
@@ -96,18 +108,19 @@
 #include <errno.h>
 #include <string.h>
 
-#include <log.h>
-#include <comstack.h>
-#include <xmalloc.h>
+#include <yaz/yconfig.h>
+#include <yaz/log.h>
+#include <yaz/comstack.h>
+#include <yaz/xmalloc.h>
 #include "eventl.h"
 #include "session.h"
-#include <statserv.h>
+#include <yaz/statserv.h>
 
 IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 {
     IOCHAN new_iochan;
 
-    if (!(new_iochan = xmalloc(sizeof(*new_iochan))))
+    if (!(new_iochan = (IOCHAN)xmalloc(sizeof(*new_iochan))))
        return 0;
     new_iochan->destroyed = 0;
     new_iochan->fd = fd;
@@ -156,13 +169,13 @@ int event_loop(IOCHAN *iochans)
             else
             {
                 /* Destroy the first member in the chain, and try again */
-                association *assoc = iochan_getdata(*iochans);
+                association *assoc = (association *)iochan_getdata(*iochans);
                 COMSTACK conn = assoc->client_link;
 
                 cs_close(conn);
                destroy_association(assoc);
                iochan_destroy(*iochans);
-                logf(LOG_DEBUG, "error while selecting, destroying iochan %p",
+                yaz_log(LOG_DEBUG, "error select, destroying iochan %p",
                        *iochans);
             }
        }