From a100b77dcdd1c23fb24a6ca119a0b985add670dc Mon Sep 17 00:00:00 2001 From: Dave West Date: Sat, 24 Oct 2009 22:45:21 +0000 Subject: [PATCH] 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 --- citadel/citserver.h | 10 ------- citadel/include/artv_deserialize.h | 26 ------------------ citadel/include/artv_dump.h | 27 ------------------- citadel/include/artv_serialize.h | 27 ------------------- citadel/include/ctdl_module.h | 16 +++++++++++ .../autocompletion/serv_autocompletion.c | 6 ----- 6 files changed, 16 insertions(+), 96 deletions(-) delete mode 100644 citadel/include/artv_deserialize.h delete mode 100644 citadel/include/artv_dump.h delete mode 100644 citadel/include/artv_serialize.h diff --git a/citadel/citserver.h b/citadel/citserver.h index 63d8708e2..3e9ead3ec 100644 --- 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 index 18699ad5d..000000000 --- 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 index 6934fda88..000000000 --- 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 index 8e4c978dd..000000000 --- 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 9019a5d1c..bbd6718de 100644 --- 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 0eb9b6e7f..10a00a704 100644 --- a/citadel/modules/autocompletion/serv_autocompletion.c +++ b/citadel/modules/autocompletion/serv_autocompletion.c @@ -46,14 +46,8 @@ #include #include #include -#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" -- 2.30.2