X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=09ee8c21f7bc7ac35e2d957492d51c6ee1a1b935;hb=2ca7b6bfd7e8d9a2cb9c36bf2520b46511a594eb;hp=ef0c49b963c7ba0d6d6ce181ed56cf5528696c64;hpb=c8b510c1c66a9119ede10b63975fc5f7f1ea49f5;p=idzebra-moved-to-github.git diff --git a/rset/rsnull.c b/rset/rsnull.c index ef0c49b..09ee8c2 100644 --- a/rset/rsnull.c +++ b/rset/rsnull.c @@ -1,4 +1,4 @@ -/* $Id: rsnull.c,v 1.33 2005-04-26 10:09:38 adam Exp $ +/* $Id: rsnull.c,v 1.34 2005-05-03 09:11:36 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -20,20 +20,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - - #include #include #include #include - -static RSFD r_open (RSET ct, int flag); -static void r_close (RSFD rfd); -static void r_delete (RSET ct); -static void r_pos (RSFD rfd, double *current, double *total); -static int r_read (RSFD rfd, void *buf, TERMID *term); -static int r_write (RSFD rfd, const void *buf); +static RSFD r_open(RSET ct, int flag); +static void r_close(RSFD rfd); +static void r_delete(RSET ct); +static void r_pos(RSFD rfd, double *current, double *total); +static int r_read(RSFD rfd, void *buf, TERMID *term); +static int r_write(RSFD rfd, const void *buf); static const struct rset_control control = { @@ -48,14 +45,14 @@ static const struct rset_control control = r_write, }; -RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol ) +RSET rsnull_create(NMEM nmem, struct rset_key_control *kcontrol ) { - RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0); - rnew->priv=NULL; + RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, 0); + rnew->priv = 0; return rnew; } -static RSFD r_open (RSET ct, int flag) +static RSFD r_open(RSET ct, int flag) { RSFD rfd; if (flag & RSETF_WRITE) @@ -63,22 +60,21 @@ static RSFD r_open (RSET ct, int flag) yaz_log (YLOG_FATAL, "NULL set type is read-only"); return NULL; } - rfd=rfd_create_base(ct); - rfd->priv=NULL; + rfd = rfd_create_base(ct); + rfd->priv = 0; return rfd; } -static void r_close (RSFD rfd) +static void r_close(RSFD rfd) { rfd_delete_base(rfd); } -static void r_delete (RSET ct) +static void r_delete(RSET ct) { } - -static void r_pos (RSFD rfd, double *current, double *total) +static void r_pos(RSFD rfd, double *current, double *total) { assert(rfd); assert(current); @@ -87,14 +83,14 @@ static void r_pos (RSFD rfd, double *current, double *total) *current=0; } -static int r_read (RSFD rfd, void *buf, TERMID *term) +static int r_read(RSFD rfd, void *buf, TERMID *term) { if (term) - *term=0; /* NULL */ + *term = 0; return 0; } -static int r_write (RSFD rfd, const void *buf) +static int r_write(RSFD rfd, const void *buf) { yaz_log (YLOG_FATAL, "NULL set type is read-only"); return -1;