From 1c948d94056d5eb4e55ef3192a360514d7946669 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 15 Nov 2004 23:13:12 +0000 Subject: [PATCH] Change spacing --- rset/rsisamb.c | 58 ++++++++++++++++++++++++++++---------------------------- rset/rsisamc.c | 38 ++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/rset/rsisamb.c b/rset/rsisamb.c index ee0762a..b132694 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,4 +1,4 @@ -/* $Id: rsisamb.c,v 1.26 2004-11-04 13:54:08 heikki Exp $ +/* $Id: rsisamb.c,v 1.27 2004-11-15 23:13:12 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -60,30 +60,30 @@ struct rset_isamb_info { ISAMB_P pos; }; -static int log_level=0; -static int log_level_initialized=0; +static int log_level = 0; +static int log_level_initialized = 0; RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope, ISAMB is, ISAMB_P pos, TERMID term) { - RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term); + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term); struct rset_isamb_info *info; if (!log_level_initialized) { - log_level=yaz_log_module_level("rsisamb"); - log_level_initialized=1; + log_level = yaz_log_module_level("rsisamb"); + log_level_initialized = 1; } info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info)); - info->is=is; - info->pos=pos; - rnew->priv=info; - logf(log_level,"rsisamb_create"); + info->is = is; + info->pos = pos; + rnew->priv = info; + yaz_log(log_level,"rsisamb_create"); return rnew; } static void r_delete (RSET ct) { - logf (log_level, "rsisamb_delete"); + yaz_log(log_level, "rsisamb_delete"); } RSFD r_open (RSET ct, int flag) @@ -94,64 +94,64 @@ RSFD r_open (RSET ct, int flag) if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "ISAMB set type is read-only"); + yaz_log(LOG_FATAL, "ISAMB set type is read-only"); return NULL; } - rfd=rfd_create_base(ct); + rfd = rfd_create_base(ct); if (rfd->priv) - ptinfo=(struct rset_pp_info *) (rfd->priv); + ptinfo = (struct rset_pp_info *) (rfd->priv); else { ptinfo = (struct rset_pp_info *)nmem_malloc(ct->nmem,sizeof(*ptinfo)); ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size); - rfd->priv=ptinfo; + rfd->priv = ptinfo; } ptinfo->pt = isamb_pp_open (info->is, info->pos, ct->scope ); - logf(log_level,"rsisamb_open"); + yaz_log(log_level,"rsisamb_open"); return rfd; } static void r_close (RSFD rfd) { - struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv); + struct rset_pp_info *ptinfo = (struct rset_pp_info *)(rfd->priv); isamb_pp_close (ptinfo->pt); rfd_delete_base(rfd); - logf(log_level,"rsisamb_close"); + yaz_log(log_level,"rsisamb_close"); } static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf) { - struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv); + struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv); int rc; - rc=isamb_pp_forward(pinfo->pt, buf, untilbuf); + rc = isamb_pp_forward(pinfo->pt, buf, untilbuf); if (rc && term) - *term=rfd->rset->term; - logf(log_level,"rsisamb_forward"); + *term = rfd->rset->term; + yaz_log(log_level,"rsisamb_forward"); return rc; } static void r_pos (RSFD rfd, double *current, double *total) { - struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv); + struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv); assert(rfd); isamb_pp_pos(pinfo->pt, current, total); - logf(log_level,"isamb.r_pos returning %0.1f/%0.1f", + yaz_log(log_level,"isamb.r_pos returning %0.1f/%0.1f", *current, *total); } static int r_read (RSFD rfd, void *buf, TERMID *term) { - struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv); + struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv); int rc; - rc=isamb_pp_read(pinfo->pt, buf); + rc = isamb_pp_read(pinfo->pt, buf); if (rc && term) - *term=rfd->rset->term; - logf(log_level,"isamb.r_read "); + *term = rfd->rset->term; + yaz_log(log_level,"isamb.r_read "); return rc; } static int r_write (RSFD rfd, const void *buf) { - logf (LOG_FATAL, "ISAMB set type is read-only"); + yaz_log(LOG_FATAL, "ISAMB set type is read-only"); return -1; } diff --git a/rset/rsisamc.c b/rset/rsisamc.c index fd56592..4f8fad1 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,4 +1,4 @@ -/* $Id: rsisamc.c,v 1.31 2004-11-15 23:09:36 adam Exp $ +/* $Id: rsisamc.c,v 1.32 2004-11-15 23:13:12 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -61,30 +61,30 @@ struct rset_isamc_info { ISAMC_P pos; }; -static int log_level=0; -static int log_level_initialized=0; +static int log_level = 0; +static int log_level_initialized = 0; RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope, ISAMC is, ISAMC_P pos, TERMID term) { - RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term); + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term); struct rset_isamc_info *info; if (!log_level_initialized) { - log_level=yaz_log_module_level("rsisamc"); - log_level_initialized=1; + log_level = yaz_log_module_level("rsisamc"); + log_level_initialized = 1; } info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info)); info->is = is; info->pos = pos; rnew->priv = info; - logf(log_level, "create: term=%p", term); + yaz_log(log_level, "create: term=%p", term); return rnew; } static void r_delete (RSET ct) { - logf (log_level, "rsisamc_delete"); + yaz_log(log_level, "rsisamc_delete"); } @@ -94,18 +94,18 @@ RSFD r_open (RSET ct, int flag) RSFD rfd; struct rset_pp_info *ptinfo; - logf (log_level, "risamc_open"); + yaz_log(log_level, "risamc_open"); if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "ISAMC set type is read-only"); + yaz_log(LOG_FATAL, "ISAMC set type is read-only"); return NULL; } rfd = rfd_create_base(ct); if (rfd->priv) - ptinfo=(struct rset_pp_info *)rfd->priv; + ptinfo = (struct rset_pp_info *)rfd->priv; else { ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo)); - rfd->priv=ptinfo; + rfd->priv = ptinfo; ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size); } ptinfo->pt = isc_pp_open(info->is, info->pos); @@ -114,7 +114,7 @@ RSFD r_open (RSET ct, int flag) static void r_close (RSFD rfd) { - struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv); + struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv); isc_pp_close(p->pt); rfd_delete_base(rfd); @@ -123,25 +123,25 @@ static void r_close (RSFD rfd) static int r_read (RSFD rfd, void *buf, TERMID *term) { - struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv); + struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv); int r; r = isc_pp_read(p->pt, buf); if (term) - *term=rfd->rset->term; - logf(log_level,"read returning term %p", *term); + *term = rfd->rset->term; + yaz_log(log_level,"read returning term %p", *term); return r; } static int r_write (RSFD rfd, const void *buf) { - logf (LOG_FATAL, "ISAMC set type is read-only"); + yaz_log(LOG_FATAL, "ISAMC set type is read-only"); return -1; } static void r_pos (RSFD rfd, double *current, double *total) { - *current=-1; /* sorry, not implemented yet */ - *total=-1; + *current = -1; /* sorry, not implemented yet */ + *total = -1; } -- 1.7.10.4