X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisam.c;h=d6788bff4307999b49ebfed63202e7afc6bb3e8b;hb=c50c56ac38c5ec857c0d42143267005048ee96dd;hp=fe2acd943f1b3ab579fadd5be26b6f8f58b244e7;hpb=f9c392f9951e6e9ad9709999a43ba9d671c4b9c7;p=idzebra-moved-to-github.git

diff --git a/rset/rsisam.c b/rset/rsisam.c
index fe2acd9..d6788bf 100644
--- a/rset/rsisam.c
+++ b/rset/rsisam.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisam.c,v $
- * Revision 1.3  1994-11-22 13:15:37  quinn
+ * Revision 1.6  1995-09-05 11:43:24  adam
+ * Complete version of temporary sets. Not tested yet though.
+ *
+ * Revision 1.5  1995/09/04  12:33:56  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.4  1995/09/04  09:10:55  adam
+ * Minor changes.
+ *
+ * Revision 1.3  1994/11/22  13:15:37  quinn
  * Simple
  *
  * Revision 1.2  1994/11/04  14:53:12  quinn
@@ -12,20 +21,18 @@
  *
  */
 
-/* TODO: Memory management
-   LINK DELETE TO CLOSE!  */
-
+#include <stdio.h>
 #include <rsisam.h>
-#include <util.h>
+#include <alexutil.h>
 
-rset_control *r_create(const struct rset_control *sel, void *parms);
-static int r_open(rset_control *ct, int wflag);
-static void r_close(rset_control *ct);
-static void r_delete(rset_control *ct);
-static void r_rewind(rset_control *ct);
-static int r_count(rset_control *ct);
-static int r_read();
-static int r_write();
+static rset_control *r_create(const struct rset_control *sel, void *parms);
+static int r_open (rset_control *ct, int wflag);
+static void r_close (rset_control *ct);
+static void r_delete (rset_control *ct);
+static void r_rewind (rset_control *ct);
+static int r_count (rset_control *ct);
+static int r_read (rset_control *ct, void *buf);
+static int r_write (rset_control *ct, const void *buf);
 
 static const rset_control control = 
 {
@@ -43,12 +50,12 @@ static const rset_control control =
 
 const rset_control *rset_kind_isam = &control;
 
-rset_control *r_create(const struct rset_control *sel, void *parms)
+static rset_control *r_create(const struct rset_control *sel, void *parms)
 {
     rset_control *newct;
     rset_isam_parms *pt = parms;
 
-    log(LOG_DEBUG, "risam_create(%s)", sel->desc);
+    logf (LOG_DEBUG, "risam_create(%s)", sel->desc);
     newct = xmalloc(sizeof(*newct));
     memcpy(newct, sel, sizeof(*sel));
     if (!(newct->buf = (char*) is_position(pt->is, pt->pos)))
@@ -58,10 +65,10 @@ rset_control *r_create(const struct rset_control *sel, void *parms)
 
 static int r_open(rset_control *ct, int wflag)
 {
-    log(LOG_DEBUG, "risam_open");
+    logf (LOG_DEBUG, "risam_open");
     if (wflag)
     {
-	log(LOG_FATAL, "ISAM set type is read-only");
+	logf (LOG_FATAL, "ISAM set type is read-only");
 	return -1;
     }
     r_rewind(ct);
@@ -75,27 +82,29 @@ static void r_close(rset_control *ct)
 
 static void r_delete(rset_control *ct)
 {
-    log(LOG_DEBUG, "risam_delete");
+    logf (LOG_DEBUG, "risam_delete");
     is_pt_free((ISPT) ct->buf);
     xfree(ct);
 }
 
 static void r_rewind(rset_control *ct)
 {
-    log(LOG_DEBUG, "risam_rewind");
+    logf (LOG_DEBUG, "risam_rewind");
     is_rewind((ISPT) ct->buf);
 }
 
-static int r_count(rset_control *ct)
-{return 0;}
+static int r_count (rset_control *ct)
+{
+    return 0;
+}
 
-static int r_read(rset_control *ct, void *buf)
+static int r_read (rset_control *ct, void *buf)
 {
     return is_readkey((ISPT) ct->buf, buf);
 }
 
-static int r_write()
+static int r_write (rset_control *ct, const void *buf)
 {
-    log(LOG_FATAL, "ISAM set type is read-only");
+    logf (LOG_FATAL, "ISAM set type is read-only");
     return -1;
 }