X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=ca452c1a58cec8417d0f79babac38a7b793d19c9;hb=cc67354cd95116f6580ebab21b67afa6523cb4bf;hp=d10b2747b8a485c0f1d7ccdbdeafa0aaf93a37cc;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git diff --git a/rset/rsnull.c b/rset/rsnull.c index d10b274..ca452c1 100644 --- a/rset/rsnull.c +++ b/rset/rsnull.c @@ -1,4 +1,4 @@ -/* $Id: rsnull.c,v 1.26 2004-09-09 10:08:06 heikki Exp $ +/* $Id: rsnull.c,v 1.28 2004-10-15 10:07:34 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -31,9 +31,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); static void r_delete (RSET ct); -static void r_rewind (RSFD rfd); static void r_pos (RSFD rfd, double *current, double *total); -static int r_read (RSFD rfd, void *buf); +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 = @@ -42,7 +41,6 @@ static const struct rset_control control = r_delete, r_open, r_close, - r_rewind, rset_default_forward, r_pos, r_read, @@ -53,7 +51,7 @@ const struct rset_control *rset_kind_null = &control; RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol ) { - RSET rnew=rset_create_base(&control, nmem, kcontrol,0); + RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0); rnew->priv=NULL; return rnew; } @@ -80,9 +78,6 @@ static void r_delete (RSET ct) { } -static void r_rewind (RSFD rfd) -{ -} static void r_pos (RSFD rfd, double *current, double *total) { @@ -93,8 +88,10 @@ static void r_pos (RSFD rfd, double *current, double *total) *current=0; } -static int r_read (RSFD rfd, void *buf) +static int r_read (RSFD rfd, void *buf, TERMID *term) { + if (term) + *term=0; /* NULL */ return 0; }