X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.h;h=adfe476c1866afcd8658947fe7c93923c70eda7c;hb=9ffea7c3315046ddcea2589656c13da5f5e0c076;hp=997775bd2a50c4381c889b66e9ec7351aed2ea74;hpb=0475c981817d12900332693297a77a9ae7168129;p=citadel.git diff --git a/citadel/citserver.h b/citadel/citserver.h index 997775bd2..adfe476c1 100644 --- a/citadel/citserver.h +++ b/citadel/citserver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2019 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -10,6 +10,9 @@ * GNU General Public License for more details. */ +/* I fucking hate const and want it to die. */ +#pragma GCC diagnostic ignored "-Wcast-qual" + #include "serv_extensions.h" #include "context.h" #include "ctdl_module.h" @@ -18,7 +21,6 @@ typedef struct RoomProcList RoomProcList; struct RoomProcList { struct RoomProcList *next; - OneRoomNetCfg *OneRNCfg; char name[ROOMNAMELEN]; char lcname[ROOMNAMELEN]; long namelen; @@ -28,16 +30,13 @@ struct RoomProcList { }; struct UserProcList { struct UserProcList *next; - char user[64]; + char user[USERNAME_SIZE]; }; #define CTDLUSERIP (IsEmptyStr(CC->cs_addr) ? CC->cs_clientinfo: CC->cs_addr) -void cit_backtrace(void); -void cit_oneline_backtrace(void); -void cit_panic_backtrace(int SigNum); void master_startup (void); -void master_cleanup (int exitcode); +int master_cleanup (int exitcode); void set_wtmpsupp (char *newtext); void set_wtmpsupp_to_current_room(void); void do_command_loop(void); @@ -50,6 +49,5 @@ void help_subst (char *strbuf, char *source, char *dest); extern int panic_fd; char CtdlCheckExpress(void); -int CtdlIsPublicClient(void); extern time_t server_startup_time; extern int openid_level_supported;