X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flocksrv.c;h=10cf88194d109bafce008ae0331014ab13ff0651;hb=fbb8cf7bf8582db044949d488ca9dcdbb92f352b;hp=7591349f3e10ae5bbb07c8715641f796a6d691d6;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git

diff --git a/index/locksrv.c b/index/locksrv.c
index 7591349..10cf881 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: locksrv.c,v $
- * Revision 1.12  1999-02-02 14:50:58  adam
+ * Revision 1.14  2000-03-15 15:00:30  adam
+ * First work on threaded version.
+ *
+ * Revision 1.13  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.12  1999/02/02 14:50:58  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.11  1998/03/05 08:45:12  adam
@@ -61,7 +67,7 @@
 
 #include "zserver.h"
 
-int zebra_server_lock_init (ZebraHandle zi)
+int zebra_server_lock_init (ZebraService zi)
 {
     char path_prefix[1024];
 
@@ -70,14 +76,14 @@ int zebra_server_lock_init (ZebraHandle zi)
     zi->server_lock_org = NULL;
 
     zebra_lock_prefix (zi->res, path_prefix);
-    zi->server_path_prefix = xmalloc (strlen(path_prefix)+1);
+    zi->server_path_prefix = (char *) xmalloc (strlen(path_prefix)+1);
     strcpy (zi->server_path_prefix, path_prefix);
 
     logf (LOG_DEBUG, "Locking system initialized");
     return 0;
 }
 
-int zebra_server_lock_destroy (ZebraHandle zi)
+int zebra_server_lock_destroy (ZebraService zi)
 {
     xfree (zi->server_path_prefix);
     zebra_lock_destroy (zi->server_lock_cmt);
@@ -86,7 +92,7 @@ int zebra_server_lock_destroy (ZebraHandle zi)
     return 0;
 }
 
-int zebra_server_lock (ZebraHandle zi, int commitPhase)
+int zebra_server_lock (ZebraService zi, int commitPhase)
 {
     if (!zi->server_lock_cmt)
     {
@@ -122,7 +128,7 @@ int zebra_server_lock (ZebraHandle zi, int commitPhase)
     return 0;
 }
 
-void zebra_server_unlock (ZebraHandle zi, int commitPhase)
+void zebra_server_unlock (ZebraService zi, int commitPhase)
 {
     if (zi->server_lock_org == NULL)
         return;
@@ -138,7 +144,7 @@ void zebra_server_unlock (ZebraHandle zi, int commitPhase)
     }
 }
 
-int zebra_server_lock_get_state (ZebraHandle zi, time_t *timep)
+int zebra_server_lock_get_state (ZebraService zi, time_t *timep)
 {
     char path[1024];
     char buf[256];