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
Properly escape \ in non-regexp searches
[idzebra-moved-to-github.git]
/
util
/
zebra-lock.c
diff --git
a/util/zebra-lock.c
b/util/zebra-lock.c
index
fbd7426
..
8d44094
100644
(file)
--- a/
util/zebra-lock.c
+++ b/
util/zebra-lock.c
@@
-1,8
+1,5
@@
-/* $Id: zebra-lock.c,v 1.10 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-2011 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
@@
-22,6
+19,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 <stdio.h>
#include <assert.h>
#include <stdio.h>
@@
-46,7
+46,7
@@
int zebra_mutex_destroy (Zebra_mutex *p)
if (p->state != 0)
{
fprintf (stderr, "zebra_mutex_destroy. state = %d\n", p->state);
if (p->state != 0)
{
fprintf (stderr, "zebra_mutex_destroy. state = %d\n", p->state);
- }
+ }
#if YAZ_POSIX_THREADS
pthread_mutex_destroy (&p->mutex);
#endif
#if YAZ_POSIX_THREADS
pthread_mutex_destroy (&p->mutex);
#endif
@@
-140,7
+140,7
@@
int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p)
{
pthread_mutex_unlock (&p->mutex);
return -1;
{
pthread_mutex_unlock (&p->mutex);
return -1;
- }
+ }
else
{
p->readers_reading--;
else
{
p->readers_reading--;
@@
-227,6
+227,7
@@
int zebra_mutex_cond_signal (Zebra_mutex_cond *p)
/*
* 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