summaryrefslogtreecommitdiffstats
path: root/src/defs.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/defs.h')
-rw-r--r--src/defs.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/defs.h b/src/defs.h
index 8396015..425e97c 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -45,10 +45,6 @@
#define get(in) (in->settings->access == cached ? in->get_next_element_cache(in) : in->get_next_element_direct(in))
#define put(in, data) (in->settings->access == cached ? in->place_next_element_cache(in, data) : in->place_next_element_direct(in, data))
-#define stream_blank .fd = -1, .settings = &settings, .get_next_element_direct = stub_getnext, \
- .get_next_element_cache = stub_getnext, .place_next_element_direct = stub_put, \
- .place_next_element_cache = stub_put, .split = stub_split, .flush = stub_flush
-
union nextoff {
struct entry_l *next;
ptrdiff_t offset;
@@ -89,15 +85,15 @@ enum dataformat {
};
enum streamtype {
- stream_invalid = -1,
+ stream_invalid,
stream_in,
stream_out,
stream_outlite,
+ stream_cache,
stream_randread
};
struct stream {
- long int parentid;
size_t n;
int fd;
enum streamtype type;
@@ -112,7 +108,7 @@ struct stream {
int (*place_next_element_direct)(struct stream * const, struct entry_l const * const);
int (*place_next_element_cache)(struct stream * const, struct entry_l const * const);
int (*split)(struct stream * const, struct stream * const, struct stream * const);
- int (*flush)(struct stream * const);
+ int (*rewind)(struct stream * const);
};
struct settings {