Add a pcap-dbus.h header and include it in pcap-dbus.c and pcap.c.

That way, we ensure that the same function prototypes are seen when
dbus_create() and dbus_findalldevs() are defined and when they're used.

Also, add pcap-dbus.c to the list of "extra" files in Makefile.in, so it
goes into the release tarball.

4 files changed, 11 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index 58fbd5cb..bfc224c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -296,6 +296,8 @@ EXTRA_DIST = \
 	pcap-config.in \
 	pcap-dag.c \
 	pcap-dag.h \
+	pcap-dbus.c \
+	pcap-dbus.h \
 	pcap-dlpi.c \
 	pcap-dos.c \
 	pcap-dos.h \
diff --git a/pcap-dbus.c b/pcap-dbus.c
index 91b6102f..b6679e43 100644
--- a/pcap-dbus.c
+++ b/pcap-dbus.c
@@ -32,8 +32,6 @@
 #include "config.h"
 #endif
 
-#include "pcap-int.h"
-
 #include <string.h>
 
 #include <time.h>
@@ -41,6 +39,9 @@
 
 #include <dbus/dbus.h>
 
+#include "pcap-dbus.h"
+#include "pcap-int.h"
+
 static int
 dbus_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
 {
@@ -81,9 +82,10 @@ dbus_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
 		/* pkth.caplen = min (payload_len, handle->snapshot); */
 
 		gettimeofday(&pkth.ts, NULL);
-		if (handle->fcode.bf_insns == NULL || bpf_filter(handle->fcode.bf_insns, raw_msg, pkth.len, pkth.caplen)) {
+		if (handle->fcode.bf_insns == NULL ||
+		    bpf_filter(handle->fcode.bf_insns, (u_char *)raw_msg, pkth.len, pkth.caplen)) {
 			handle->md.packets_read++;
-			callback(user, &pkth, raw_msg);
+			callback(user, &pkth, (u_char *)raw_msg);
 			count++;
 		}
 
diff --git a/pcap-dbus.h b/pcap-dbus.h
new file mode 100644
index 00000000..67493cce
--- /dev/null
+++ b/pcap-dbus.h
@@ -0,0 +1,2 @@
+pcap_t *dbus_create(const char *, char *, int *);
+int dbus_findalldevs(pcap_if_t **devlistp, char *errbuf);
diff --git a/pcap.c b/pcap.c
index 7e70bde5..491537d2 100644
--- a/pcap.c
+++ b/pcap.c
@@ -106,8 +106,7 @@ static const char rcsid[] _U_ =
 #endif
 
 #ifdef PCAP_SUPPORT_DBUS
-int dbus_findalldevs(pcap_if_t **alldevsp, char *err_str);
-pcap_t *dbus_create(const char *device, char *ebuf, int *is_ours);
+#include "pcap-dbus.h"
 #endif
 
 int