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
Fix bug #249: rstemp sets fail. Problem was that rset files were
[idzebra-moved-to-github.git]
/
index
/
lockutil.c
diff --git
a/index/lockutil.c
b/index/lockutil.c
index
12821b3
..
96b69d3
100644
(file)
--- a/
index/lockutil.c
+++ b/
index/lockutil.c
@@
-1,6
+1,6
@@
-/* $Id: lockutil.c,v 1.17 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: lockutil.c,v 1.20 2005-01-15 19:38:26 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-97,7
+97,7
@@
ZebraLockHandle zebra_lock_create (const char *dir,
if (h->fd == -1)
{
if (h->excl_flag <= 1)
if (h->fd == -1)
{
if (h->excl_flag <= 1)
- logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "open %s", fname);
xfree (h);
h = 0;
}
xfree (h);
h = 0;
}
@@
-116,7
+116,7
@@
void zebra_lock_destroy (ZebraLockHandle h)
void zebra_lock_prefix (Res res, char *path)
{
void zebra_lock_prefix (Res res, char *path)
{
- char *lock_dir = res_get_def (res, "lockDir", "");
+ const char *lock_dir = res_get_def (res, "lockDir", "");
strcpy (path, lock_dir);
if (*path && path[strlen(path)-1] != '/')
strcpy (path, lock_dir);
if (*path && path[strlen(path)-1] != '/')