X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=3e236bcf406d2c21878cf21589c0b5dab0c1bfdc;hb=929d26653d54a64c12dff06cbb470c22667d79f1;hp=d126b983eb3d9ff5de51b8ddbc5de3d29b844ea6;hpb=ec280185445fa342a6bf2f6a12ab3d29bbd1e54c;p=yaz-moved-to-github.git diff --git a/server/statserv.c b/server/statserv.c index d126b98..3e236bc 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -6,7 +6,7 @@ * NT threaded server code by * Chas Woodfield, Fretwell Downing Informatics. * - * $Id: statserv.c,v 1.81 2002-05-07 11:01:59 adam Exp $ + * $Id: statserv.c,v 1.85 2002-09-25 12:37:07 adam Exp $ */ #include @@ -243,7 +243,7 @@ void statserv_closedown() } } -void event_loop_thread (IOCHAN iochan) +void __cdecl event_loop_thread (IOCHAN iochan) { event_loop (&iochan); } @@ -412,7 +412,8 @@ static void listener(IOCHAN h, int event) char dummy[1]; int res; - if ((res = read(hand[0], dummy, 1)) < 0 && errno != EINTR) + if ((res = read(hand[0], dummy, 1)) < 0 && + yaz_errno() != EINTR) { yaz_log(LOG_FATAL|LOG_ERRNO, "handshake read"); return; @@ -831,7 +832,7 @@ int check_options(int argc, char **argv) fprintf(stderr, "Usage: %s [ -a -v " " -l -u -c -t " " -k -d " - " -ziST -w ... ]\n", me); + " -ziST1 -w ... ]\n", me); return 1; } } @@ -871,7 +872,7 @@ int statserv_main(int argc, char **argv, /* Now setup the service with the service controller */ SetupService(argc, argv, &ArgDetails, SZAPPNAME, cb->service_name, /* internal service name */ - cb->service_name, /* displayed name of the service */ + cb->service_display_name, /* displayed name */ SZDEPENDENCIES); return 0; }