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
Fix term counters to be of type zint. Fix several printfs of zint.
[idzebra-moved-to-github.git]
/
rset
/
rsprox.c
diff --git
a/rset/rsprox.c
b/rset/rsprox.c
index
6a43203
..
60f80ab
100644
(file)
--- a/
rset/rsprox.c
+++ b/
rset/rsprox.c
@@
-1,4
+1,4
@@
-/* $Id: rsprox.c,v 1.4 2004-08-03 12:15:45 heikki Exp $
+/* $Id: rsprox.c,v 1.6 2004-08-04 09:59:03 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
@@
-25,8
+25,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <assert.h>
#include <string.h>
#include <assert.h>
-#include <rsprox.h>
#include <zebrautl.h>
#include <zebrautl.h>
+#include <rsprox.h>
#ifndef RSET_DEBUG
#define RSET_DEBUG 0
#ifndef RSET_DEBUG
#define RSET_DEBUG 0
@@
-40,7
+40,6
@@
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 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);
@@
-53,7
+52,7
@@
static const struct rset_control control_prox =
r_delete,
r_rewind,
r_forward,
r_delete,
r_rewind,
r_forward,
- /* r_count, */
+ rset_default_pos,
r_read,
r_write,
};
r_read,
r_write,
};
@@
-370,12
+369,6
@@
static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
return 0;
}
return 0;
}
-/*
-static int r_count (RSET ct)
-{
- return 0;
-}
-*/
static int r_read (RSFD rfd, void *buf, int *term_index)
{
static int r_read (RSFD rfd, void *buf, int *term_index)
{