X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Ftstflock.c;h=43a7f254f27db9c6347719a6fe3da5adfb774463;hb=707cc9ebfa7f462ec58a31cfbad4c1a09fecfa00;hp=76166b493283fd47524de609fd3ec7a0e98720c1;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git diff --git a/util/tstflock.c b/util/tstflock.c index 76166b4..43a7f25 100644 --- a/util/tstflock.c +++ b/util/tstflock.c @@ -1,5 +1,5 @@ -/* $Id: tstflock.c,v 1.16 2006-08-14 10:40:34 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: tstflock.c,v 1.19 2007-05-16 12:31:17 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -71,7 +71,7 @@ pthread_mutex_t sleep_mutex = PTHREAD_MUTEX_INITIALIZER; int test_fd = 0; -static void small_sleep() +static void small_sleep(void) { #ifdef WIN32 Sleep(2); @@ -194,7 +194,7 @@ static void tst_thread(int num, int write_flag) num, write_flag, seq); } -static void tst() +static void tst(void) { tst_thread(4, 1); /* write locks */ if (1) @@ -213,7 +213,7 @@ static void tst() tst_thread(20, 2); /* random locks */ } -void fork_tst() +void fork_tst(void) { #if HAVE_SYS_WAIT_H pid_t pid[2]; @@ -241,14 +241,8 @@ void fork_tst() int main(int argc, char **argv) { - char logname[220]; YAZ_CHECK_INIT(argc, argv); - - sprintf(logname, "%.200s.log", argv[0]); - yaz_log_init_file(logname); - - /* log time + thread id (%!) */ - yaz_log_time_format("%c:%!"); + YAZ_CHECK_LOG(); /* ensure the flock system logs in our test */ yaz_log_init_level(yaz_log_mask_str("flock"));