From b6fe7f8d9ade5e1b665bcf2cddb145fd2e0fde57 Mon Sep 17 00:00:00 2001
From: Gediminas Jakutis <gediminas@varciai.lt>
Date: Mon, 2 Mar 2020 21:18:32 +0200
Subject: implement get/put wrappers.

Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>
---
 src/defs.h |  4 ++--
 src/io.c   | 20 ++++++++++++++++++++
 src/main.c |  7 ++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/defs.h b/src/defs.h
index b06e181..e6f1823 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -29,6 +29,8 @@ struct stream {
 	int fd;
 	int out;
 	char *name;
+	int (*get)(struct stream *, size_t, struct entry_l *, int);
+	int (*put)(struct stream *, size_t, struct entry_l *, int);
 };
 
 struct settings {
@@ -39,8 +41,6 @@ struct settings {
 	char *fileout;
 	unsigned int flags;
 	enum opmode opmode;
-	int (*get)(struct stream, size_t, struct entry_l *, int);
-	int (*put)(struct stream, size_t, struct entry_l *, int);
 };
 
 #endif /* ALGOS_DEFS_H_INCLUDED */
diff --git a/src/io.c b/src/io.c
index edcda17..a67c230 100644
--- a/src/io.c
+++ b/src/io.c
@@ -10,6 +10,7 @@
 #include <libgen.h>
 #include "io.h"
 #include "defs.h"
+#include "datagen.h"
 
 static int stream_open_in(struct stream * const in, const struct settings * const s);
 static int stream_open_out(struct stream * const in, const struct settings * const s);
@@ -83,6 +84,25 @@ early_err:
 	return ret;
 }
 
+int stream_get(struct stream *in, size_t idx, struct entry_l *data, int tag)
+{
+	int ret = 0;
+
+	ret = in->get(in, idx, data, tag);
+
+	return ret;
+}
+
+int stream_put(struct stream *in, size_t idx, struct entry_l *data, int tag)
+{
+	int ret = 0;
+
+	ret = in->put(in, idx, data, tag);
+
+	return ret;
+}
+
+
 static int stream_open_out(struct stream * const in, const struct settings * const s)
 {
 	struct stat st;
diff --git a/src/main.c b/src/main.c
index ca3b600..56c7791 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,11 +37,8 @@ int main(int argc, char **argv)
 
 	file_out.name = settings.fileout ? settings.fileout : settings.filein;
 
-	if ((ret = stream_open(&file_in, &settings))) {
-		goto out;
-	}
-
-	if ((ret = stream_open(&file_out, &settings))) {
+	if ((ret = stream_open(&file_in, &settings)) ||
+			(ret = stream_open(&file_out, &settings))) {
 		goto out;
 	}
 
-- 
cgit v1.2.3