X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Ftstflock.c;h=43a7f254f27db9c6347719a6fe3da5adfb774463;hb=707cc9ebfa7f462ec58a31cfbad4c1a09fecfa00;hp=ae4861c09c5fd309f3d079f023b5f974370294f7;hpb=a5ae2b3069c7059bf103c1787cc61c7091026ee1;p=idzebra-moved-to-github.git

diff --git a/util/tstflock.c b/util/tstflock.c
index ae4861c..43a7f25 100644
--- a/util/tstflock.c
+++ b/util/tstflock.c
@@ -1,9 +1,24 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
- * See the file LICENSE for details.
- *
- * $Id: tstflock.c,v 1.15 2006-07-05 12:33:38 adam Exp $
- */
+/* $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.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #include <assert.h>
 #include <stdlib.h>
@@ -56,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);
@@ -179,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)
@@ -198,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];
@@ -226,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"));