X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisams.c;h=7236fc203d7e784175a1808d2b9c12ec579120e0;hp=6dc81e903120c7c4ea067307abc2141f49ebd0c5;hb=3bb2fd863b1664f1ff71dadb540313f301ca234f;hpb=de8f6928dbda1d5622e59429bd7bf4d494c25af2

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 6dc81e9..7236fc2 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,8 +1,5 @@
-/* $Id: rsisams.c,v 1.25 2006-06-01 13:05:52 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.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,11 +12,14 @@ 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
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <idzebra/util.h>
@@ -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,12 +85,12 @@ 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));
-        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;
 }
 
@@ -130,6 +129,7 @@ static void r_pos (RSFD rfd, double *current, double *total)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab