Seperate public and private object declarations.

12 files changed, 24 insertions, 13 deletions

diff --git a/omapip/alloc.c b/omapip/alloc.c
index 8d93751b..67d32120 100644
--- a/omapip/alloc.c
+++ b/omapip/alloc.c
@@ -21,7 +21,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 isc_result_t omapi_object_reference (omapi_object_t **r,
 				     omapi_object_t *h,
diff --git a/omapip/buffer.c b/omapip/buffer.c
index 25c3b351..9533ef71 100644
--- a/omapip/buffer.c
+++ b/omapip/buffer.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 /* Make sure that at least len bytes are in the input buffer, and if not,
    read enough bytes to make up the difference. */
diff --git a/omapip/connection.c b/omapip/connection.c
index 7916fe32..5fa4603d 100644
--- a/omapip/connection.c
+++ b/omapip/connection.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 isc_result_t omapi_connect (omapi_object_t *c,
 			    const char *server_name,
diff --git a/omapip/dispatch.c b/omapip/dispatch.c
index 257a1a40..659f998a 100644
--- a/omapip/dispatch.c
+++ b/omapip/dispatch.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 static omapi_io_object_t omapi_io_states;
 u_int32_t cur_time;
@@ -137,7 +137,7 @@ isc_result_t omapi_wait_for_completion (omapi_object_t *object,
 		waiter = (omapi_waiter_object_t *)0;
 
 	do {
-		status = omapi_one_dispatch (waiter, t);
+		status = omapi_one_dispatch ((omapi_object_t *)waiter, t);
 		if (status != ISC_R_SUCCESS)
 			return status;
 	} while (!waiter || !waiter -> ready);
@@ -164,7 +164,7 @@ isc_result_t omapi_wait_for_completion (omapi_object_t *object,
 	return ISC_R_SUCCESS;
 }
 
-isc_result_t omapi_one_dispatch (omapi_waiter_object_t *waiter,
+isc_result_t omapi_one_dispatch (omapi_object_t *wo,
 				 struct timeval *t)
 {
 	fd_set r, w, x;
@@ -174,6 +174,12 @@ isc_result_t omapi_one_dispatch (omapi_waiter_object_t *waiter,
 	struct timeval now, to;
 	omapi_io_object_t *io, *prev;
 	isc_result_t status;
+	omapi_waiter_object_t *waiter;
+
+	if (!wo || wo -> type != omapi_type_waiter)
+		waiter = (omapi_waiter_object_t *)0;
+	else
+		waiter = (omapi_waiter_object_t *)wo;
 
 	FD_ZERO (&x);
 
diff --git a/omapip/generic.c b/omapip/generic.c
index 4f19b736..8f1fcc10 100644
--- a/omapip/generic.c
+++ b/omapip/generic.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 isc_result_t omapi_generic_new (omapi_object_t **gen, const char *name)
 {
diff --git a/omapip/handle.c b/omapip/handle.c
index 0fcb0317..5a907bc7 100644
--- a/omapip/handle.c
+++ b/omapip/handle.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 /* The handle table is a hierarchical tree designed for quick mapping
    of handle identifiers to objects.  Objects contain their own handle
diff --git a/omapip/listener.c b/omapip/listener.c
index dea6e616..fa1f65d3 100644
--- a/omapip/listener.c
+++ b/omapip/listener.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 isc_result_t omapi_listen (omapi_object_t *h,
 			   int port,
diff --git a/omapip/message.c b/omapip/message.c
index 4efdcae2..d4c9d569 100644
--- a/omapip/message.c
+++ b/omapip/message.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 omapi_message_object_t *omapi_registered_messages;
 
diff --git a/omapip/protocol.c b/omapip/protocol.c
index 71690f44..cfb59c4e 100644
--- a/omapip/protocol.c
+++ b/omapip/protocol.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 isc_result_t omapi_protocol_connect (omapi_object_t *h,
 				     const char *server_name,
diff --git a/omapip/result.c b/omapip/result.c
index 57660d89..0f9349ed 100644
--- a/omapip/result.c
+++ b/omapip/result.c
@@ -21,7 +21,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 static const char *text[ISC_R_NRESULTS] = {
 	"success",				/*  0 */
diff --git a/omapip/support.c b/omapip/support.c
index a438c73e..86535d5b 100644
--- a/omapip/support.c
+++ b/omapip/support.c
@@ -20,7 +20,7 @@
  * http://www.isc.org for more information.
  */
 
-#include <omapip/omapip.h>
+#include <omapip/omapip_p.h>
 
 omapi_object_type_t *omapi_type_connection;
 omapi_object_type_t *omapi_type_listener;
diff --git a/omapip/test.c b/omapip/test.c
index fa80ff77..d8065d94 100644
--- a/omapip/test.c
+++ b/omapip/test.c
@@ -20,6 +20,11 @@
  * http://www.isc.org for more information.
  */
 
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <isc/result.h>
 #include <omapip/omapip.h>
 
 int main (int argc, char **argv)