Minor adjustments

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

diff --git a/server/eventl.c b/server/eventl.c
index 5fb960d..1ffd053 100644 (file)
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.11  1995-06-19 12:39:09  quinn
+ * Revision 1.16  1995-11-01 13:54:56  quinn
+ * Minor adjustments
+ *
+ * Revision 1.15  1995/09/15  14:44:15  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.14  1995/08/29  14:44:50  quinn
+ * Reset timeouts.
+ *
+ * Revision 1.13  1995/08/29  11:17:56  quinn
+ * Added code to receive close
+ *
+ * Revision 1.12  1995/08/29  10:41:18  quinn
+ * Small.
+ *
+ * Revision 1.11  1995/06/19  12:39:09  quinn
  * Fixed bug in timeout code. Added BER dumper.
  *
  * Revision 1.10  1995/06/16  10:31:33  quinn
@@ -40,6 +55,7 @@
  *
  */
 
+#include <stdio.h>
 #include <assert.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -53,7 +69,7 @@
 
 #include <eventl.h>
 
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 static IOCHAN iochans = 0;
 
@@ -66,7 +82,7 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 {
     IOCHAN new;
 
-    if (!(new = malloc(sizeof(*new))))
+    if (!(new = xmalloc(sizeof(*new))))
        return 0;
     new->destroyed = 0;
     new->fd = fd;
@@ -140,7 +156,10 @@ int event_loop()
            }
            if (!p->destroyed && p->max_idle && now - p->last_event >
                p->max_idle)
+           {
+               p->last_event = now;
                (*p->fun)(p, EVENT_TIMEOUT);
+           }
        }
        for (p = iochans; p; p = nextp)
        {
@@ -162,7 +181,7 @@ int event_loop()
                }
                if (nextp == p)
                    nextp = p->next;
-               free(tmp);
+               xfree(tmp);
            }
        }
     }