projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with 1_3_16_branch. Fix bug 128.
[idzebra-moved-to-github.git]
/
rset
/
rset.c
diff --git
a/rset/rset.c
b/rset/rset.c
index
51df906
..
6f7c342
100644
(file)
--- a/
rset/rset.c
+++ b/
rset/rset.c
@@
-1,4
+1,4
@@
-/* $Id: rset.c,v 1.29 2004-08-31 10:43:39 heikki Exp $
+/* $Id: rset.c,v 1.32 2004-09-03 14:59:50 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-66,12
+66,13
@@
void rfd_delete_base(RSFD rfd)
rs->free_list=rfd;
}
rs->free_list=rfd;
}
-RSET rset_create_base(const struct rset_control *sel, NMEM nmem)
- /* FIXME - Add keysize and cmp function */
- /* FIXME - Add a general key-func block for cmp, dump, etc */
+
+RSET rset_create_base(const struct rset_control *sel,
+ NMEM nmem, const struct key_control *kcontrol)
{
RSET rnew;
NMEM M;
{
RSET rnew;
NMEM M;
+ /* assert(nmem); */ /* can not yet be used, api/t4 fails */
if (nmem)
M=nmem;
else
if (nmem)
M=nmem;
else
@@
-87,7
+88,7
@@
RSET rset_create_base(const struct rset_control *sel, NMEM nmem)
rnew->count = 1;
rnew->priv = 0;
rnew->free_list=NULL;
rnew->count = 1;
rnew->priv = 0;
rnew->free_list=NULL;
-
+ rnew->keycontrol=kcontrol;
return rnew;
}
return rnew;
}
@@
-123,7
+124,6
@@
void rset_default_pos (RSFD rfd, double *current, double *total)
#endif
int rset_default_forward(RSFD rfd, void *buf,
#endif
int rset_default_forward(RSFD rfd, void *buf,
- int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf)
{
int more=1;
const void *untilbuf)
{
int more=1;
@@
-136,7
+136,7
@@
int rset_default_forward(RSFD rfd, void *buf,
logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
more=rset_read(rfd, buf);
if (more)
logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
more=rset_read(rfd, buf);
if (more)
- cmp=(*cmpfunc)(untilbuf,buf);
+ cmp=(rfd->rset->keycontrol->cmp)(untilbuf,buf);
/* if (more)
key_logdump(LOG_DEBUG,buf); */
}
/* if (more)
key_logdump(LOG_DEBUG,buf); */
}