X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fflock.c;h=f046c9a5c8961b2de3d9b41bc0a66d3888788586;hb=4097bac1dce126e79ce1550fad8b2034a311ff80;hp=330fbf79eac687432ecf55ef89f0bebe51f770b3;hpb=38241cbf471b954b9bfcb94e50375a25c069faf6;p=idzebra-moved-to-github.git

diff --git a/util/flock.c b/util/flock.c
index 330fbf7..f046c9a 100644
--- a/util/flock.c
+++ b/util/flock.c
@@ -1,5 +1,5 @@
-/* $Id: flock.c,v 1.17 2006-07-05 12:02:12 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: flock.c,v 1.21 2007-01-15 15:10:26 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ 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 Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -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