Hide struct io and implementation of struct ioqueue

Move struct io and struct ioqueue from ioqueue.h to ioqueue.c.
Declare incomplete struct ioqueue in ioqueue.h.

diff --git a/include/ioqueue.h b/include/ioqueue.h
index 1ced66fdf06b0118694279bba27fc6032b752b46..2d6f4735ed9b1566d40f63e5e8401d129191e4c5 100644 (file)
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -35,21 +35,8 @@
 #define IOQUEUE_H
 
 #include <sys/uio.h>
 #define IOQUEUE_H
 
 #include <sys/uio.h>

-#include "queue.h"

 
 

-struct io {
-    struct emp_qelem queue;
-    int size;
-    int nbytes;
-    int offset;
-    char *data;
-};
-
-struct ioqueue {
-    struct io list;
-    int bufsize;
-    int cc;
-};
+struct ioqueue;

 
 extern struct ioqueue *ioq_create(int size);
 extern void ioq_destroy(struct ioqueue *ioq);
 
 extern struct ioqueue *ioq_create(int size);
 extern void ioq_destroy(struct ioqueue *ioq);

diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index 655a364dc66ec214a922fb37a57b6d9d7e288ea5..95f090fdc89e068cc630dad9e48e480412cff97a 100644 (file)
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -46,6 +46,20 @@
 #include "misc.h"
 #include "queue.h"
 
 #include "misc.h"
 #include "queue.h"
 

+struct io {
+    struct emp_qelem queue;
+    int size;
+    int nbytes;
+    int offset;
+    char *data;
+};
+
+struct ioqueue {
+    struct io list;
+    int bufsize;
+    int cc;
+};
+

 static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, int stopc);
 static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov, int max);
 static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);
 static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, int stopc);
 static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov, int max);
 static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);