X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisams.c;h=4c6898086289b57e3f2488aac0c71a2b0f607189;hb=e92856ea4fecc1a5ea6875ad47797d462fd5fcae;hp=5fd70cf94fcae151fd6f413fe48f9688945d7a6e;hpb=2cb08a89ee65d8ae2646b91dcf27bc3883759691;p=idzebra-moved-to-github.git

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 5fd70cf..4c68980 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,5 +1,5 @@
-/* $Id: rsisams.c,v 1.23 2005-05-24 11:35:43 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: rsisams.c,v 1.26 2006-06-01 13:10:16 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -39,7 +39,7 @@ static const struct rset_control control =
     rset_get_one_term,
     r_open,
     r_close,
-    0, /* no foward */
+    0, /* no forward */
     r_pos,
     r_read,
     r_write,
@@ -61,7 +61,7 @@ RSET rsisams_create(NMEM nmem, struct rset_key_control *kcontrol,
 {
     RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0);
     struct rset_private *info;
-    info = (struct rset_private *) nmem_malloc(rnew->nmem,sizeof(*info));
+    info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info));
     rnew->priv = info;
     info->is = is;
     info->pos = pos;
@@ -85,14 +85,14 @@ RSFD r_open (RSET ct, int flag)
         yaz_log (YLOG_FATAL, "ISAMS set type is read-only");
         return NULL;
     }
-    rfd=rfd_create_base(ct);
+    rfd = rfd_create_base(ct);
     if (rfd->priv)
-        ptinfo=(struct rfd_private *)(rfd->priv);
+        ptinfo = (struct rfd_private *)(rfd->priv);
     else {
         ptinfo = (struct rfd_private *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
-        ptinfo->pt = isams_pp_open (info->is, info->pos);
-        rfd->priv=ptinfo;
+        rfd->priv = ptinfo;
     }
+    ptinfo->pt = isams_pp_open (info->is, info->pos);
     return rfd;
 }
 
@@ -107,10 +107,9 @@ static void r_close (RSFD rfd)
 static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
     struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
-    int rc;
-    rc=isams_pp_read(ptinfo->pt, buf);
+    int rc = isams_pp_read(ptinfo->pt, buf);
     if (rc && term)
-        *term=rfd->rset->term;
+        *term = rfd->rset->term;
     return rc;
 }
 
@@ -127,3 +126,11 @@ static void r_pos (RSFD rfd, double *current, double *total)
 }
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+