Change ioq_dequeue() to return void

For symmetry with ioq_append().

diff --git a/include/ioqueue.h b/include/ioqueue.h
index 0f17be67460b9f86ca0c945272f804774bf4f6e5..38fd5917879b94b39089ef67323fd6aec5df21da 100644 (file)
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -43,7 +43,7 @@ extern void ioq_destroy(struct ioqueue *ioq);
 extern void ioq_drain(struct ioqueue *ioq);
 extern int ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc);
 extern int ioq_peek(struct ioqueue *ioq, char *buf, int cc);
 extern void ioq_drain(struct ioqueue *ioq);
 extern int ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc);
 extern int ioq_peek(struct ioqueue *ioq, char *buf, int cc);

-extern int ioq_dequeue(struct ioqueue *ioq, int cc);
+extern void ioq_dequeue(struct ioqueue *ioq, int cc);

 extern void ioq_append(struct ioqueue *ioq, char *buf, int cc);
 extern int ioq_qsize(struct ioqueue *ioq);
 extern int ioq_gets(struct ioqueue *ioq, char *buf, int cc);
 extern void ioq_append(struct ioqueue *ioq, char *buf, int cc);
 extern int ioq_qsize(struct ioqueue *ioq);
 extern int ioq_gets(struct ioqueue *ioq, char *buf, int cc);

diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index f6450463bdd724d4dca7d218e7ebf5b0cdb04686..c820b7877a704aa3408de5dfaa7e9c791ab1f9a2 100644 (file)
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -129,12 +129,11 @@ ioq_peek(struct ioqueue *ioq, char *buf, int cc)
     return ioqtobuf(ioq, buf, cc);
 }
 
     return ioqtobuf(ioq, buf, cc);
 }
 

-int
+void

 ioq_dequeue(struct ioqueue *ioq, int cc)
 {
     int res = removecc(ioq, cc);
     CANT_HAPPEN(res != cc);
 ioq_dequeue(struct ioqueue *ioq, int cc)
 {
     int res = removecc(ioq, cc);
     CANT_HAPPEN(res != cc);

-    return res;

 }
 
 void
 }
 
 void