From 38b3aec67e67dfaff67670494e6e570bff2246aa Mon Sep 17 00:00:00 2001
From: Dave West <davew@uncensored.citadel.org>
Date: Sat, 24 Oct 2009 23:23:27 +0000
Subject: [PATCH] Cleaning the API a bit more.

serv_autocompletion no longer needs to include anything but ctdl_module.h
---
 citadel/clientsocket.c                        |  2 +
 citadel/config.c                              |  4 ++
 citadel/config.h                              | 10 ----
 citadel/ical_dezonify.c                       |  2 +
 citadel/include/ctdl_module.h                 | 50 +++++++++++++++++++
 citadel/internet_addressing.c                 |  1 +
 citadel/ldap.c                                |  3 ++
 .../autocompletion/serv_autocompletion.c      | 35 +------------
 citadel/serv_extensions.h                     |  1 -
 9 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index f63c4b11f..d0c397df0 100644
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -48,6 +48,8 @@
 #include "config.h"
 #include "clientsocket.h"
 
+#include "ctdl_module.h"
+
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
 #endif
diff --git a/citadel/config.c b/citadel/config.c
index dad9eaee1..fb9df692d 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -33,6 +33,10 @@
 #include "server.h"
 #include "config.h"
 
+
+#include "ctdl_module.h"
+
+
 struct config config;
 
 /*
diff --git a/citadel/config.h b/citadel/config.h
index 28636eef9..967818c54 100644
--- a/citadel/config.h
+++ b/citadel/config.h
@@ -21,17 +21,7 @@
 #include "serv_extensions.h"
 #include "citadel_dirs.h"
 
-/* 
- * Global system configuration.  Don't change anything here.  It's all in dtds/config-defs.h now.
- */
-struct config {
-#include "datadefinitions.h"
-#include "dtds/config-defs.h"
-#include "undef_data.h"
-};
-
 
 void get_config(void);
 void put_config(void);
-extern struct config config;
 
diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 776fe8634..dc9c245af 100644
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ical_dezonify.h"
 
+#include "ctdl_module.h"
+
 
 /*
  * Figure out which time zone needs to be used for timestamps that are
diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index bbd6718de..345a786f6 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -3,7 +3,40 @@
 #ifndef CTDL_MODULE_H
 #define CTDL_MODULE_H
 
+#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <signal.h>
+#include <pwd.h>
+#include <errno.h>
+#include <sys/types.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#include <sys/wait.h>
+#include <string.h>
+#include <limits.h>
+
+
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
+
 #include <libcitadel.h>
+
 #include "server.h"
 #include "sysdep_decls.h"
 #include "msgbase.h"
@@ -219,4 +252,21 @@ enum {
 	ac_internal
 };
 
+
+
+/*
+ * API declarations from serv_extensions.h
+ */
+void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name);
+/* 
+ * Global system configuration.  Don't change anything here.  It's all in dtds/config-defs.h now.
+ */
+struct config {
+#include "datadefinitions.h"
+#include "dtds/config-defs.h"
+#include "undef_data.h"
+};
+
+extern struct config config;
+
 #endif /* CTDL_MODULE_H */
diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index caca08066..ca1dffd19 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -44,6 +44,7 @@
 #include "parsedate.h"
 #include "database.h"
 
+#include "ctdl_module.h"
 
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
diff --git a/citadel/ldap.c b/citadel/ldap.c
index 0a4cb2c44..45051120b 100644
--- a/citadel/ldap.c
+++ b/citadel/ldap.c
@@ -59,6 +59,9 @@ int ctdl_require_ldap_version = 3;
 #include "threads.h"
 #include "citadel_ldap.h"
 
+#include "ctdl_module.h"
+
+
 #ifdef HAVE_LDAP
 
 #define LDAP_DEPRECATED 1	/* Needed to suppress misleading warnings */
diff --git a/citadel/modules/autocompletion/serv_autocompletion.c b/citadel/modules/autocompletion/serv_autocompletion.c
index 10a00a704..28cc0bec4 100644
--- a/citadel/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/modules/autocompletion/serv_autocompletion.c
@@ -19,43 +19,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
-#include <pwd.h>
-#include <errno.h>
-#include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <limits.h>
-#include <libcitadel.h>
-#include "support.h"
-#include "config.h"
-#include "serv_autocompletion.h"
-
 #include "ctdl_module.h"
 
 
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
+#include "serv_autocompletion.h"
 
 
 
diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index 9a658b036..becdb675c 100644
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -198,6 +198,5 @@ void CtdlDestroyServiceHook(void);
 void CtdlDestroyFixedOutputHooks(void);
 int PerformFixedOutputHooks(char *, char *, int);
 
-void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name);
 
 #endif /* SERV_EXTENSIONS_H */
-- 
2.30.2