style cleanup

diff --git a/citadel/server/citadel_dirs.c b/citadel/server/citadel_dirs.c
index 6fce40cb192acad78e42606a1de7c1fa1af15f7b..7a7a6d5e69bbca18e33ae698535d1a95ab9ad90a 100644 (file)
--- 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 <unistd.h>
 #include <stdio.h>

diff --git a/citadel/server/config.c b/citadel/server/config.c
index de80290bbddd680bb4ae8502fcafcdaaa4d0bca7..7e0db5bb4a5ccc6bbb528bdeca91e584dfd76296 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <netdb.h>
-//#include <crypt.h>
 #include <sys/utsname.h>
 #include <libcitadel.h>
 #include <assert.h>

diff --git a/citadel/server/config.h b/citadel/server/config.h
index df68382922581dd62d558064dab717ddbd6e6534..cbe2548c92909688b058556f117175008d5421f4 100644 (file)
--- 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 0e1547e11f8410b831527208ff951c8c753270c7..51e0c8e29a1f04741892c08091523654b0c5d4ec 100644 (file)
--- 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 <stdlib.h>

diff --git a/citadel/server/makeuserkey.c b/citadel/server/makeuserkey.c
index f7f9fd19e06dd7df8233691b3491746c571ab8f1..1c5469522b2fb1f6fc8211f2bfd5754148bbb586 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>
@@ -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 c6cce4988357fbec8739b864136aa2220ea51337..d0d240177a9ec368cbf07b895a0bb1fda3a4129b 100644 (file)
--- 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 88bfa13c2684cf77ba4718f8f59692620b2b5dee..80f6536b40abf5b62403192b340097af4dfe59c1 100644 (file)
--- 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 5061ed55ef5a7d94c249bb6ff6229acab11e074a..f9d82bf6ededaa56bce6f00945954f7102ee229e 100644 (file)
--- 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<MAXFLOORS; ++i) {
                        floorcache[floor_num] = NULL;
                }
-       initialized = 1;
+               initialized = 1;
        }
        if (floorcache[floor_num] == NULL) {
                fetch_new = 1;
@@ -505,9 +501,7 @@ void CtdlPutFloor(struct floor *flbuf, int floor_num) {
                memcpy(floorcache[floor_num], flbuf, sizeof(struct floor));
        }
        end_critical_section(S_FLOORCACHE);
-
-       cdb_store(CDB_FLOORTAB, &floor_num, sizeof(int),
-                 flbuf, sizeof(struct floor));
+       cdb_store(CDB_FLOORTAB, &floor_num, sizeof(int), flbuf, sizeof(struct floor));
 }