X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisams.c;h=bf560615bb3bb23915cc32d690b9cc2709c44113;hb=4478d785b7769691261005c98063b98a5a5971b3;hp=6b5f41c2072e638585869389b5b0579b6e7605e7;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git diff --git a/rset/rsisams.c b/rset/rsisams.c index 6b5f41c..bf56061 100644 --- a/rset/rsisams.c +++ b/rset/rsisams.c @@ -1,5 +1,5 @@ -/* $Id: rsisams.c,v 1.24 2006-05-10 08:13:33 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: rsisams.c,v 1.27 2006-08-14 10:40:21 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ 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 + */ #include @@ -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; }