From fd392a81796b0b94695e642fc095e1f9c8278c8b Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 3 Jan 2024 13:12:25 -0500 Subject: [PATCH] style cleanup --- citadel/server/citadel_dirs.c | 4 ++-- citadel/server/config.c | 5 ++--- citadel/server/config.h | 12 +++--------- citadel/server/default_timezone.c | 4 ++-- citadel/server/makeuserkey.c | 8 +++----- citadel/server/modules_init.c | 4 ---- citadel/server/modules_init.h | 3 +-- citadel/server/room_ops.c | 14 ++++---------- 8 files changed, 17 insertions(+), 37 deletions(-) diff --git a/citadel/server/citadel_dirs.c b/citadel/server/citadel_dirs.c index 6fce40cb1..7a7a6d5e6 100644 --- a/citadel/server/citadel_dirs.c +++ b/citadel/server/citadel_dirs.c @@ -1,9 +1,9 @@ // citadel_dirs.c : calculate pathnames for various files used in the Citadel system // -// Copyright (c) 1987-2021 by the citadel.org team +// Copyright (c) 1987-2024 by the citadel.org team // // This program is open source software. Use, duplication, or disclosure -// is subject to the terms of the GNU General Public License, version 3. +// are subject to the terms of the GNU General Public License, version 3. #include #include diff --git a/citadel/server/config.c b/citadel/server/config.c index de80290bb..7e0db5bb4 100644 --- a/citadel/server/config.c +++ b/citadel/server/config.c @@ -1,16 +1,15 @@ // Read and write the system configuration database // -// Copyright (c) 1987-2022 by the citadel.org team +// Copyright (c) 1987-2024 by the citadel.org team // // This program is open source software. Use, duplication, or disclosure -// is subject to the terms of the GNU General Public License, version 3. +// are subject to the terms of the GNU General Public License, version 3. #include "sysdep.h" #include #include #include #include -//#include #include #include #include diff --git a/citadel/server/config.h b/citadel/server/config.h index df6838292..cbe2548c9 100644 --- a/citadel/server/config.h +++ b/citadel/server/config.h @@ -1,12 +1,7 @@ -// Copyright (c) 1987-2016 by the citadel.org team +// Copyright (c) 1987-2024 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. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// This program is open source software. Use, duplication, or disclosure +// are subject to the terms of the GNU General Public License version 3. #include "serv_extensions.h" #include "citadel_dirs.h" @@ -106,7 +101,6 @@ long CtdlGetConfigLong(char *); void CtdlSetConfigInt(char *key, int value); void CtdlSetConfigLong(char *key, long value); void CtdlDelConfig(char *key); - char *CtdlGetSysConfig(char *sysconfname); void CtdlPutSysConfig(char *sysconfname, char *sysconfdata); void validate_config(void); diff --git a/citadel/server/default_timezone.c b/citadel/server/default_timezone.c index 0e1547e11..51e0c8e29 100644 --- a/citadel/server/default_timezone.c +++ b/citadel/server/default_timezone.c @@ -1,8 +1,8 @@ // -// Copyright (c) 1987-2022 by the citadel.org team +// Copyright (c) 1987-2024 by the citadel.org team // // This program is open source software. Use, duplication, or disclosure -// is subject to the terms of the GNU General Public License, version 3. +// are subject to the terms of the GNU General Public License, version 3. #include "sysdep.h" #include diff --git a/citadel/server/makeuserkey.c b/citadel/server/makeuserkey.c index f7f9fd19e..1c5469522 100644 --- a/citadel/server/makeuserkey.c +++ b/citadel/server/makeuserkey.c @@ -1,9 +1,9 @@ // makeuserkey() - convert a username into the format used as a database key // -// Copyright (c) 1987-2023 by the citadel.org team +// Copyright (c) 1987-2024 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. +// This program is open source software. Use, duplication, or disclosure +// are subject to the terms of the GNU General Public License, version 3. #include #include @@ -36,5 +36,3 @@ void makeuserkey(char *key, const char *username) { } key[keylen++] = 0; } - - diff --git a/citadel/server/modules_init.c b/citadel/server/modules_init.c index c6cce4988..d0d240177 100644 --- a/citadel/server/modules_init.c +++ b/citadel/server/modules_init.c @@ -42,11 +42,7 @@ void initialize_modules(int is_threading) { syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_syscmd()); syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_serv_user()); syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_expire()); - - // FIXME - // There is something in this module that fux0rs the new backend, causing it to deadlock. syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_fulltext()); - syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_image()); syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_imap()); syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_sieve()); diff --git a/citadel/server/modules_init.h b/citadel/server/modules_init.h index 88bfa13c2..80f6536b4 100644 --- a/citadel/server/modules_init.h +++ b/citadel/server/modules_init.h @@ -4,7 +4,6 @@ // // This program is open source software. Use, duplication, or disclosure // is subject to the terms of the GNU General Public License, version 3. -// The program is distributed without any warranty, expressed or implied. // // To add new modules to the server: // 1. Write the module and place it in a server/modules/[module_name]/ directory @@ -61,4 +60,4 @@ char *ctdl_module_init_vcard(void); char *ctdl_module_init_wiki(void); char *ctdl_module_init_xmpp(void); char *ctdl_module_init_netconfig(void); -#endif // MODULES_INIT_H +#endif diff --git a/citadel/server/room_ops.c b/citadel/server/room_ops.c index 5061ed55e..f9d82bf6e 100644 --- a/citadel/server/room_ops.c +++ b/citadel/server/room_ops.c @@ -1,6 +1,6 @@ // Server functions which perform operations on room objects. // -// Copyright (c) 1987-2023 by the citadel.org team +// Copyright (c) 1987-2024 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. @@ -212,14 +212,12 @@ void CtdlRoomAccess(struct ctdlroom *roombuf, struct ctdluser *userbuf, int *res retval = retval | UA_REPLYALLOWED; } - // If "collaborative deletion" is active for this room, any user who can post - // is also allowed to delete + // If "collaborative deletion" is active for this room, any user who can post is also allowed to delete if (roombuf->QRflags2 & QR2_COLLABDEL) { if (retval & UA_POSTALLOWED) { retval = retval | UA_DELETEALLOWED; } } - } // Check to see if the user has forgotten this room @@ -342,9 +340,7 @@ int CtdlGetRoomLock(struct ctdlroom *qrbuf, const char *room_name) { register int retval; retval = CtdlGetRoom(qrbuf, room_name); if (retval == 0) { - //syslog(LOG_ERR, "\033[33mCtdlGetRoomLock(%p) requested\033[0m", pthread_self()); begin_critical_section(S_ROOMS); - //syslog(LOG_ERR, "\033[31mCtdlGetRoomLock(%p) acquired\033[0m", pthread_self()); } return(retval); } @@ -473,7 +469,7 @@ struct floor *CtdlGetCachedFloor(int floor_num) { for (i=0; i