projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
[idzebra-moved-to-github.git]
/
util
/
tstflock.c
diff --git
a/util/tstflock.c
b/util/tstflock.c
index
76166b4
..
515e4ee
100644
(file)
--- a/
util/tstflock.c
+++ b/
util/tstflock.c
@@
-1,8
+1,5
@@
-/* $Id: tstflock.c,v 1.16 2006-08-14 10:40:34 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2009 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
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
@@
-71,7
+68,7
@@
pthread_mutex_t sleep_mutex = PTHREAD_MUTEX_INITIALIZER;
int test_fd = 0;
int test_fd = 0;
-static void small_sleep()
+static void small_sleep(void)
{
#ifdef WIN32
Sleep(2);
{
#ifdef WIN32
Sleep(2);
@@
-194,7
+191,7
@@
static void tst_thread(int num, int write_flag)
num, write_flag, seq);
}
num, write_flag, seq);
}
-static void tst()
+static void tst(void)
{
tst_thread(4, 1); /* write locks */
if (1)
{
tst_thread(4, 1); /* write locks */
if (1)
@@
-213,7
+210,7
@@
static void tst()
tst_thread(20, 2); /* random locks */
}
tst_thread(20, 2); /* random locks */
}
-void fork_tst()
+void fork_tst(void)
{
#if HAVE_SYS_WAIT_H
pid_t pid[2];
{
#if HAVE_SYS_WAIT_H
pid_t pid[2];
@@
-241,14
+238,8
@@
void fork_tst()
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- char logname[220];
YAZ_CHECK_INIT(argc, argv);
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"));
/* ensure the flock system logs in our test */
yaz_log_init_level(yaz_log_mask_str("flock"));
@@
-268,6
+259,7
@@
int main(int argc, char **argv)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab