From c038a022f891ee58e6d30aec93644d17d2b686d6 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 12 Nov 2007 08:41:56 +0000 Subject: [PATCH] Rename function event_loop to iochan_event_loop. --- src/eventl.c | 6 +++--- src/eventl.h | 4 ++-- src/statserv.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/eventl.c b/src/eventl.c index 2764c92..6146138 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: eventl.c,v 1.15 2007-11-09 22:08:14 adam Exp $ + * $Id: eventl.c,v 1.16 2007-11-12 08:41:56 adam Exp $ */ /** @@ -10,7 +10,7 @@ * \brief Implements event loop handling for GFS. * * This source implements the main event loop for the Generic Frontend - * Server. It uses select(2). + * Server. */ #include @@ -77,7 +77,7 @@ int iochan_is_alive(IOCHAN chan) return 1; } -int event_loop(IOCHAN *iochans) +int iochan_event_loop(IOCHAN *iochans) { do /* loop as long as there are active associations to process */ { diff --git a/src/eventl.h b/src/eventl.h index 300e9cd..ac24123 100644 --- a/src/eventl.h +++ b/src/eventl.h @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: eventl.h,v 1.8 2007-01-03 08:42:15 adam Exp $ + * $Id: eventl.h,v 1.9 2007-11-12 08:41:56 adam Exp $ */ /** @@ -59,7 +59,7 @@ int force_event; IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, int port); int iochan_is_alive(IOCHAN chan); -int event_loop(IOCHAN *iochans); +int iochan_event_loop(IOCHAN *iochans); void statserv_remove (IOCHAN pIOChannel); #endif /* diff --git a/src/statserv.c b/src/statserv.c index 731bce5..49221f2 100644 --- a/src/statserv.c +++ b/src/statserv.c @@ -5,7 +5,7 @@ * NT threaded server code by * Chas Woodfield, Fretwell Downing Informatics. * - * $Id: statserv.c,v 1.50 2007-08-13 16:46:47 mike Exp $ + * $Id: statserv.c,v 1.51 2007-11-12 08:41:56 adam Exp $ */ /** @@ -1043,7 +1043,7 @@ static void *new_session (void *vp) control_block.one_shot = 1; if (control_block.threads) { - event_loop(&new_chan); + iochan_event_loop(&new_chan); } else { @@ -1343,7 +1343,7 @@ int statserv_start(int argc, char **argv) if (pListener == NULL) return 1; yaz_log(YLOG_DEBUG, "Entering event loop."); - return event_loop(&pListener); + return iochan_event_loop(&pListener); } static void option_copy(char *dst, const char *src) -- 1.7.10.4