Cleaning the API a bit more.

serv_autocompletion no longer needs to include anything but ctdl_module.h

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index f63c4b11f6dfea7fb731c7fb6eb6628c60d9af87..d0c397df0b7b5fb09c35f7aa3c2b322f8c0a78c9 100644 (file)
--- 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 dad9eaee1437075d76e8f1a5e84b2fdf98f24fc1..fb9df692df1f2443df30043fa774ec53bee70b23 100644 (file)
--- 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 28636eef97aae776b9ff4e97685a29eac10db277..967818c54a54c47b8750742284c002504e2a093d 100644 (file)
--- 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 776fe8634a1ff5e73d69539ba8b47d9bd8c1498e..dc9c245afae949ccbcd84b2771da8e94e644f8ae 100644 (file)
--- 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 bbd6718de3540b61331434239f3894b8cb0a2848..345a786f642086eef8e456c3022b0f3ae51d8345 100644 (file)
--- 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 caca0806603056ada966702e8931edff4ce4613d..ca1dffd194acdae57a6c2f1bedf71739d176572b 100644 (file)
--- 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 0a4cb2c44a49fee407c10fb2794882b3c48e1c86..45051120bbcc27bb8eb11d5b8d447b3a1f052fad 100644 (file)
--- 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 10a00a7048603818afbeff288742edd4a7efc304..28cc0bec457bbd5d2dc8b30070e7f89bc17941ec 100644 (file)
--- 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 9a658b0366acc062061099be6738116c1a58685a..becdb675c92da6bea50e2e9322ad7a7f98c46891 100644 (file)
--- 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 */