From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 26 Apr 2009 05:43:47 +0000 (+0200)
Subject: Hide struct io and implementation of struct ioqueue
X-Git-Tag: v4.3.23~94
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=55c53b9add8c0d9b1abc60cd29a464abcfbc52fa

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 1ced66fdf..2d6f4735e 100644
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -35,21 +35,8 @@
 #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);
diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index 655a364dc..95f090fdc 100644
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -46,6 +46,20 @@
 #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);