Removed the artv_*.h files, they arent used any more.

Cleaned the API a bit, moved prototype of CtdlAccessCheck and the enum it uses
into ctdl_module.h which is where the API is defined.

Cleaned some unused includes from serv_autocompletion.c

diff --git a/citadel/citserver.h b/citadel/citserver.h
index 63d8708e216fdae39709a299bbe36dd9b9bc78a2..3e9ead3ecf3470d0f8405c86109013e28ac760b0 100644 (file)
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -46,17 +46,7 @@ void GenerateRoomDisplay(char *real_room,
 extern int panic_fd;
 char CtdlCheckExpress(void);
 
-int CtdlAccessCheck(int);
 
-/* 'required access level' values which may be passed to CtdlAccessCheck()
- */
-enum {
-       ac_none,
-       ac_logged_in,
-       ac_room_aide,
-       ac_aide,
-       ac_internal
-};
 
 
 

diff --git a/citadel/include/artv_deserialize.h b/citadel/include/artv_deserialize.h
deleted file mode 100644 (file)
index 18699ad..0000000
--- a/citadel/include/artv_deserialize.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- *
- * $Id$
- *
- * this file contains the defines that cause our x-macros to serialize for artv export
- */
-#define CFG_VALUE(a,b) a
-#define PROTOCOL_ONLY(a)
-#define SERVER_PRIVATE(a) a
-#define NO_ARTV(a)
-#define SUBSTRUCT(a)
-#define SUBSTRUCT_ELEMENT(a) a
-
-#define UNSIGNED(a) client_getln(cbuf, sizeof cbuf); buf->a = atoi(cbuf)
-#define UNSIGNED_INT(a) client_getln(cbuf, sizeof cbuf); buf->a = atoi(cbuf)
-#define INTEGER(a) client_getln(cbuf, sizeof cbuf); buf->a = atoi(cbuf)
-#define LONG(a) client_getln(cbuf, sizeof cbuf); buf->a = atol(cbuf)
-#define UINT8(a) client_getln(cbuf, sizeof cbuf); buf->a = atoi(cbuf)
-#define UNSIGNED_SHORT(a) client_getln(cbuf, sizeof cbuf); buf->a = atoi(cbuf)
-#define CHAR(a) client_getln(cbuf, sizeof cbuf); buf->a = atoi(cbuf)
-
-#define TIME(a) client_getln(cbuf, sizeof cbuf); buf->a = atol(cbuf)
-#define UID_T(a) client_getln(cbuf, sizeof cbuf); buf->a = atol(cbuf)
-
-#define STRING_BUF(a, b) client_getln(buf->a, b)
-#define STRING(a) client_getln(buf->a, sizeof buf->a)

diff --git a/citadel/include/artv_dump.h b/citadel/include/artv_dump.h
deleted file mode 100644 (file)
index 6934fda..0000000
--- a/citadel/include/artv_dump.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *
- * $Id: artv_serialize.h 5474 2007-09-20 04:11:52Z ajc $
- *
- * this file contains the defines that cause our x-macros to serialize for artv export
- */
-
-#define CFG_VALUE(a,b) a
-#define NO_ARTV(a)
-#define PROTOCOL_ONLY(a)
-#define SERVER_PRIVATE(a) a
-#define SUBSTRUCT(a)
-#define SUBSTRUCT_ELEMENT(a) a
-
-#define UNSIGNED(a) cprintf(" %s: %u\n", #a, buf->a)
-#define UNSIGNED_INT(a) cprintf(" %s: %u\n", #a buf->a)
-#define INTEGER(a) cprintf(" %s: %d\n", #a, buf->a)
-#define LONG(a) cprintf(" %s: %ld\n", #a, buf->a)
-#define UINT8(a) cprintf(" %s: %d\n", #a, buf->a)
-#define UNSIGNED_SHORT(a) cprintf(" %s: %u\n", #a, buf->a)
-#define CHAR(a) cprintf(" %s: %d\n", #a, buf->a)
-
-#define TIME(a) cprintf(" %s: %ld\n", #a, (long)buf->a)
-#define UID_T(a) cprintf(" %s: %ld\n", #a, (long)buf->a)
-
-#define STRING_BUF(a, b) cprintf(" %s: %s\n", #a, buf->a)
-#define STRING(a) cprintf(" %s: %s\n", #a, buf->a)

diff --git a/citadel/include/artv_serialize.h b/citadel/include/artv_serialize.h
deleted file mode 100644 (file)
index 8e4c978..0000000
--- a/citadel/include/artv_serialize.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *
- * $Id$
- *
- * this file contains the defines that cause our x-macros to serialize for artv export
- */
-
-#define CFG_VALUE(a,b) a
-#define NO_ARTV(a)
-#define PROTOCOL_ONLY(a)
-#define SERVER_PRIVATE(a) a
-#define SUBSTRUCT(a)
-#define SUBSTRUCT_ELEMENT(a) a
-
-#define UNSIGNED(a) cprintf("%u\n", buf->a)
-#define UNSIGNED_INT(a) cprintf("%u\n", buf->a)
-#define INTEGER(a) cprintf("%d\n", buf->a)
-#define LONG(a) cprintf("%ld\n", buf->a)
-#define UINT8(a) cprintf("%d\n", buf->a)
-#define UNSIGNED_SHORT(a) cprintf("%u\n", buf->a)
-#define CHAR(a) cprintf("%d\n", buf->a)
-
-#define TIME(a) cprintf("%ld\n", (long)buf->a)
-#define UID_T(a) cprintf("%ld\n", (long)buf->a)
-
-#define STRING_BUF(a, b) cprintf("%s\n", buf->a)
-#define STRING(a) cprintf("%s\n", buf->a)

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 9019a5d1c22c5422e44f883956dba2d21f21b9fc..bbd6718de3540b61331434239f3894b8cb0a2848 100644 (file)
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -203,4 +203,20 @@ enum {
        crr_access_denied               /* not allowed to edit this room */
 };
 
+
+
+/*
+ * API declarations from citserver.h
+ */
+int CtdlAccessCheck(int);
+/* 'required access level' values which may be passed to CtdlAccessCheck()
+ */
+enum {
+       ac_none,
+       ac_logged_in,
+       ac_room_aide,
+       ac_aide,
+       ac_internal
+};
+
 #endif /* CTDL_MODULE_H */

diff --git a/citadel/modules/autocompletion/serv_autocompletion.c b/citadel/modules/autocompletion/serv_autocompletion.c
index 0eb9b6e7f189d312344a0a6d342fe9aff646ef4c..10a00a7048603818afbeff288742edd4a7efc304 100644 (file)
--- a/citadel/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/modules/autocompletion/serv_autocompletion.c
@@ -46,14 +46,8 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "msgbase.h"
-#include "user_ops.h"
-#include "database.h"
 #include "serv_autocompletion.h"
 
 #include "ctdl_module.h"