X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fflock.c;h=3157f3689cb1acc5a328bb68663ce92cf9266c43;hp=3e9777aac223d48c3933a93f4793f12fed5b9a0b;hb=d513d15e315601b730b0b3a6126c3163d00223fb;hpb=4478d785b7769691261005c98063b98a5a5971b3

diff --git a/util/flock.c b/util/flock.c
index 3e9777a..3157f36 100644
--- a/util/flock.c
+++ b/util/flock.c
@@ -1,8 +1,5 @@
-/* $Id: flock.c,v 1.18 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
@@ -21,6 +18,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -250,7 +250,7 @@ static int unixLock(int fd, int type, int cmd)
 
 int zebra_lock_w(ZebraLockHandle h)
 {
-    int r;
+    int r = 0;
     int do_lock = 0;
     yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s begin", 
             h->p->fd, h, h->p->fname);
@@ -287,7 +287,7 @@ int zebra_lock_w(ZebraLockHandle h)
 
 int zebra_lock_r(ZebraLockHandle h)
 {
-    int r;
+    int r = 0;
     int do_lock = 0;
 
     yaz_log(log_level, "zebra_lock_r fd=%d p=%p fname=%s begin", 
@@ -368,7 +368,7 @@ int zebra_unlock(ZebraLockHandle h)
  * The default posix_locks=1 is assumed.. This function sets posix_locks
  * to zero if linuxthreads is in use.
  */
-static int check_for_linuxthreads()
+static int check_for_linuxthreads(void)
 {
 #if __linux
 #ifdef _CS_GNU_LIBPTHREAD_VERSION
@@ -404,6 +404,7 @@ void zebra_flock_init()
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab