From 543987da5860041f6cfac693460b4e8226d99715 Mon Sep 17 00:00:00 2001
From: leitner <leitner>
Date: Fri, 31 Oct 2003 23:34:40 +0000
Subject: [PATCH] remove superfluous #includes make it possibly to specify that
 a buffer should be freed

---
 io/io_canread.c          |  1 -
 io/io_canwrite.c         |  1 -
 io/io_check.c            |  4 ----
 io/io_fd.c               |  1 -
 io/io_tryreadtimeout.c   |  3 ---
 io/io_trywritetimeout.c  |  3 ---
 io/io_wait.c             |  4 ----
 io/io_waituntil.c        |  5 +----
 io/iob_addbuf.c          | 12 +-----------
 io/iob_addbuf_free.c     |  5 +++++
 io/iob_addbuf_internal.c | 15 +++++++++++++++
 io/iob_adds_free.c       |  6 ++++++
 12 files changed, 28 insertions(+), 32 deletions(-)
 create mode 100644 io/iob_addbuf_free.c
 create mode 100644 io/iob_addbuf_internal.c
 create mode 100644 io/iob_adds_free.c

diff --git a/io/io_canread.c b/io/io_canread.c
index df3705a..7e8df7c 100644
--- a/io/io_canread.c
+++ b/io/io_canread.c
@@ -1,6 +1,5 @@
 #include <unistd.h>
 #include <sys/time.h>
-#include <poll.h>
 #include <errno.h>
 #include "io_internal.h"
 
diff --git a/io/io_canwrite.c b/io/io_canwrite.c
index 6fea1fd..0aaec31 100644
--- a/io/io_canwrite.c
+++ b/io/io_canwrite.c
@@ -1,6 +1,5 @@
 #include <unistd.h>
 #include <sys/time.h>
-#include <poll.h>
 #include <errno.h>
 #include "io_internal.h"
 
diff --git a/io/io_check.c b/io/io_check.c
index 2516b12..b4a0702 100644
--- a/io/io_check.c
+++ b/io/io_check.c
@@ -1,7 +1,3 @@
-#include <unistd.h>
-#include <sys/time.h>
-#include <poll.h>
-#include <errno.h>
 #include "io_internal.h"
 
 void io_check() {
diff --git a/io/io_fd.c b/io/io_fd.c
index 7cb3983..ec613f4 100644
--- a/io/io_fd.c
+++ b/io/io_fd.c
@@ -4,7 +4,6 @@
 #undef extern
 #include "byte.h"
 #ifdef HAVE_SIGIO
-#include <sys/poll.h>
 #include <signal.h>
 #include <fcntl.h>
 #endif
diff --git a/io/io_tryreadtimeout.c b/io/io_tryreadtimeout.c
index e123703..3d0876f 100644
--- a/io/io_tryreadtimeout.c
+++ b/io/io_tryreadtimeout.c
@@ -1,6 +1,3 @@
-#include <unistd.h>
-#include <sys/time.h>
-#include <poll.h>
 #include <errno.h>
 #include "io_internal.h"
 
diff --git a/io/io_trywritetimeout.c b/io/io_trywritetimeout.c
index e0761c5..5c81455 100644
--- a/io/io_trywritetimeout.c
+++ b/io/io_trywritetimeout.c
@@ -1,6 +1,3 @@
-#include <unistd.h>
-#include <sys/time.h>
-#include <poll.h>
 #include <errno.h>
 #include "io_internal.h"
 
diff --git a/io/io_wait.c b/io/io_wait.c
index 9c0ff29..392063f 100644
--- a/io/io_wait.c
+++ b/io/io_wait.c
@@ -1,7 +1,3 @@
-#include <unistd.h>
-#include <sys/time.h>
-#include <poll.h>
-#include <errno.h>
 #include "io_internal.h"
 
 void io_wait() {
diff --git a/io/io_waituntil.c b/io/io_waituntil.c
index 2bc4d72..36bfbcb 100644
--- a/io/io_waituntil.c
+++ b/io/io_waituntil.c
@@ -1,7 +1,3 @@
-#include <unistd.h>
-#include <sys/time.h>
-#include <poll.h>
-#include <errno.h>
 #include "io_internal.h"
 #include "safemult.h"
 
@@ -12,5 +8,6 @@ void io_waituntil(tai6464 t) {
   taia_sub(&diff,&t,&now);
   if (!umult64(diff.sec.x,1000,&x) || (y=x+diff.nano/10000000)<x)
     y=-1;	/* overflow; wait indefinitely */
+  if (!y && diff.nano) y=1;
   io_waituntil2(y);
 }
diff --git a/io/iob_addbuf.c b/io/iob_addbuf.c
index b70a08a..240922b 100644
--- a/io/iob_addbuf.c
+++ b/io/iob_addbuf.c
@@ -1,15 +1,5 @@
 #include "iob_internal.h"
 
 int iob_addbuf(io_batch* b,const void* buf,uint64 n) {
-  iob_entry* e=array_allocate(&b->b,sizeof(iob_entry),
-			     array_length(&b->b,sizeof(iob_entry)));
-  if (!e) return 0;
-  e->type=FROMBUF;
-  e->fd=-1;
-  e->buf=buf;
-  e->n=n;
-  e->offset=0;
-  b->bytesleft+=n;
-  ++b->bufs;
-  return 1;
+  return iob_addbuf_internal(b,buf,n,0);
 }
diff --git a/io/iob_addbuf_free.c b/io/iob_addbuf_free.c
new file mode 100644
index 0000000..99e13e3
--- /dev/null
+++ b/io/iob_addbuf_free.c
@@ -0,0 +1,5 @@
+#include "iob_internal.h"
+
+int iob_addbuf(io_batch* b,const void* buf,uint64 n) {
+  return iob_addbuf_internal(b,buf,n,1);
+}
diff --git a/io/iob_addbuf_internal.c b/io/iob_addbuf_internal.c
new file mode 100644
index 0000000..bba8fe1
--- /dev/null
+++ b/io/iob_addbuf_internal.c
@@ -0,0 +1,15 @@
+#include "iob_internal.h"
+
+int iob_addbuf_internal(io_batch* b,const void* buf,uint64 n,int _free) {
+  iob_entry* e=array_allocate(&b->b,sizeof(iob_entry),
+			     array_length(&b->b,sizeof(iob_entry)));
+  if (!e) return 0;
+  e->type=_free?FROMBUF_FREE:FROMBUF;
+  e->fd=-1;
+  e->buf=buf;
+  e->n=n;
+  e->offset=0;
+  b->bytesleft+=n;
+  ++b->bufs;
+  return 1;
+}
diff --git a/io/iob_adds_free.c b/io/iob_adds_free.c
new file mode 100644
index 0000000..875f138
--- /dev/null
+++ b/io/iob_adds_free.c
@@ -0,0 +1,6 @@
+#include "str.h"
+#include "iob.h"
+
+int iob_adds(io_batch* b,const char* s) {
+  return iob_addbuf_free(b,s,str_len(s));
+}