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
More type casts due to zint.
[idzebra-moved-to-github.git]
/
rset
/
rsisamb.c
diff --git
a/rset/rsisamb.c
b/rset/rsisamb.c
index
68600ed
..
7965ece
100644
(file)
--- a/
rset/rsisamb.c
+++ b/
rset/rsisamb.c
@@
-1,4
+1,4
@@
-/* $Id: rsisamb.c,v 1.9 2004-08-03 12:15:45 heikki Exp $
+/* $Id: rsisamb.c,v 1.14 2004-08-06 12:55:03 adam 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
@@
-39,7
+39,7
@@
static void r_rewind (RSFD rfd);
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
-/* static int r_count (RSET ct);*/
+static void r_pos (RSFD rfd, double *current, double *total);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
@@
-52,7
+52,7
@@
static const struct rset_control control =
r_delete,
r_rewind,
r_forward, /* rset_default_forward, */
r_delete,
r_rewind,
r_forward, /* rset_default_forward, */
- /* r_count, */
+ r_pos,
r_read,
r_write,
};
r_read,
r_write,
};
@@
-63,7
+63,7
@@
struct rset_pp_info {
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
- int *countp;
+ zint *countp;
void *buf;
};
void *buf;
};
@@
-156,7
+156,7
@@
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf)
{
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf)
{
- int i; /*!*/
+ int i;
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
#if RSET_DEBUG
logf (LOG_DEBUG, "rset_rsisamb_forward starting '%s' (ct=%p rfd=%p)",
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
#if RSET_DEBUG
logf (LOG_DEBUG, "rset_rsisamb_forward starting '%s' (ct=%p rfd=%p)",
@@
-172,18
+172,23
@@
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
return i;
}
return i;
}
-/*
-static int r_count (RSET ct)
+static void r_pos (RSFD rfd, double *current, double *total)
{
{
- return 0;
+ struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+ assert(rfd);
+ isamb_pp_pos(pinfo->pt, current, total);
+#if RSET_DEBUG
+ logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f",
+ *current, *total);
+#endif
}
}
-*/
static int r_read (RSFD rfd, void *buf, int *term_index)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
*term_index = 0;
static int r_read (RSFD rfd, void *buf, int *term_index)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
*term_index = 0;
+
r = isamb_pp_read(pinfo->pt, buf);
if (r > 0)
{
r = isamb_pp_read(pinfo->pt, buf);
if (r > 0)
{