X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftstflock.c;h=884dd4ab71ad2d873fbe4ec1b6e6a7c5cd683152;hp=a023d73162a98bd9d92b26f0f34ef193f32272cf;hb=250de4ed23a44f5eb3552db317eef0d0fbe3265c;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197

diff --git a/util/tstflock.c b/util/tstflock.c
index a023d73..884dd4a 100644
--- a/util/tstflock.c
+++ b/util/tstflock.c
@@ -1,8 +1,5 @@
-/* $Id: tstflock.c,v 1.18 2007-01-15 15:10:26 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 Index Data
 
 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
@@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <stdlib.h>
 #include <yaz/test.h>
@@ -107,7 +107,7 @@ void *run_func(void *arg)
 
         if (use_write_lock == 2) /* random lock */
             write_lock = (rand() & 3) == 3 ? 1 : 0;
-            
+
         if (write_lock)
         {
             zebra_lock_w(lh);
@@ -115,21 +115,21 @@ void *run_func(void *arg)
             write(test_fd, "L", 1);
             *seqp++ = 'L';
             small_sleep();
-            *seqp++ = 'U';  
+            *seqp++ = 'U';
             write(test_fd, "U", 1);
-          
+
             zebra_unlock(lh);
         }
         else
         {
             zebra_lock_r(lh);
-            
+
             write(test_fd, "l", 1);
             *seqp++ = 'l';
             small_sleep();
             *seqp++ = 'u';
             write(test_fd, "u", 1);
-            
+
             zebra_unlock(lh);
         }
     }
@@ -190,7 +190,7 @@ static void tst_thread(int num, int write_flag)
     for (i = 0; i < num; i++)
         YAZ_CHECK(id[i] == 123);
     *seqp++ = '\0';
-    yaz_log(YLOG_LOG, "tst_thread(%d,%d) returns seq=%s", 
+    yaz_log(YLOG_LOG, "tst_thread(%d,%d) returns seq=%s",
             num, write_flag, seq);
 }
 
@@ -241,14 +241,8 @@ void fork_tst(void)
 
 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"));
@@ -268,6 +262,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab