random acts of style cleanup

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 7801761f61d1fb9cee43130198bc5b3e90e12d99..f12543acca7aa71b8c7c9a3c8682b4fd474844bc 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -29,11 +29,8 @@ int panic_fd;
 int openid_level_supported = 0;
 
 
-/*
- * Various things that need to be initialized at startup
- */
-void master_startup(void)
-{
+// Various things that need to be initialized at startup
+void master_startup(void) {
        struct timeval tv;
        unsigned int seed;
        FILE *urandom;
@@ -60,7 +57,7 @@ void master_startup(void)
        syslog(LOG_INFO, "Opening databases");
        open_databases();
 
-       /* Load site-specific configuration */
+       // Load site-specific configuration
        syslog(LOG_INFO, "Initializing configuration system");
        initialize_config_system();
        validate_config();
@@ -73,7 +70,7 @@ void master_startup(void)
                ForEachUser(reindex_user_928, NULL);
        }
 
-       /* Check floor reference counts */
+       // Check floor reference counts
        check_ref_counts();
 
        syslog(LOG_INFO, "Creating base rooms (if necessary)");
@@ -82,13 +79,13 @@ void master_startup(void)
        CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS);
        CtdlCreateRoom(CtdlGetConfigStr("c_twitroom"), 0, "", 0, 1, 0, VIEW_BBS);
 
-       /* The "Local System Configuration" room doesn't need to be visible */
+       // The "Local System Configuration" room doesn't need to be visible
        if (CtdlGetRoomLock(&qrbuf, SYSCONFIGROOM) == 0) {
                qrbuf.QRflags2 |= QR2_SYSTEM;
                CtdlPutRoomLock(&qrbuf);
        }
 
-       /* Aide needs to be public postable, else we're not RFC conformant. */
+       // Aide needs to be public postable, else we're not RFC conformant.
        if (CtdlGetRoomLock(&qrbuf, AIDEROOM) == 0) {
                qrbuf.QRflags2 |= QR2_SMTP_PUBLIC;
                CtdlPutRoomLock(&qrbuf);
@@ -102,7 +99,8 @@ void master_startup(void)
                        syslog(LOG_ERR, "citserver: failed to read random seed: %m");
                }
                fclose(urandom);
-       } else {
+       }
+       else {
                gettimeofday(&tv, NULL);
                seed = tv.tv_usec;
        }
@@ -113,11 +111,8 @@ void master_startup(void)
 }
 
 
-/*
- * Cleanup routine to be called when the server is shutting down.  Returns the needed exit code.
- */
-int master_cleanup(int exitcode)
-{
+// Cleanup routine to be called when the server is shutting down.  Returns the needed exit code.
+int master_cleanup(int exitcode) {
        static int already_cleaning_up = 0;
 
        if (already_cleaning_up) {
@@ -127,17 +122,17 @@ int master_cleanup(int exitcode)
        }
        already_cleaning_up = 1;
 
-       /* Do system-dependent stuff */
+       // Do system-dependent stuff
        sysdep_master_cleanup();
 
-       /* Close the configuration system */
+       // Close the configuration system
        shutdown_config_system();
 
-       /* Close databases */
+       // Close databases
        syslog(LOG_INFO, "citserver: closing databases");
        close_databases();
 
-       /* If the operator requested a halt but not an exit, halt here. */
+       // If the operator requested a halt but not an exit, halt here.
        if (shutdown_and_halt) {
                syslog(LOG_ERR, "citserver: Halting server without exiting.");
                fflush(stdout);
@@ -147,59 +142,53 @@ int master_cleanup(int exitcode)
                }
        }
 
-       /* Now go away. */
+       // Now go away.
        syslog(LOG_ERR, "citserver: Exiting with status %d", exitcode);
        fflush(stdout);
        fflush(stderr);
 
        if (restart_server != 0) {
                exitcode = 1;
-       } else if ((running_as_daemon != 0) && ((exitcode == 0))) {
+       }
+       else if ((running_as_daemon != 0) && ((exitcode == 0))) {
                exitcode = CTDLEXIT_SHUTDOWN;
        }
        return (exitcode);
 }
 
 
-/*
- * returns an asterisk if there are any instant messages waiting,
- * space otherwise.
- */
-char CtdlCheckExpress(void)
-{
+// returns an asterisk if there are any instant messages waiting, space otherwise.
+char CtdlCheckExpress(void) {
        if (CC->FirstExpressMessage == NULL) {
                return (' ');
-       } else {
+       }
+       else {
                return ('*');
        }
 }
 
 
-void citproto_begin_session()
-{
+void citproto_begin_session() {
        if (CC->nologin == 1) {
                cprintf("%d Too many users are already online (maximum is %d)\n",
                        ERROR + MAX_SESSIONS_EXCEEDED, CtdlGetConfigInt("c_maxsessions")
-                   );
+               );
                CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED;
-       } else {
+       }
+       else {
                cprintf("%d %s Citadel server ready.\n", CIT_OK, CtdlGetConfigStr("c_fqdn"));
                CC->can_receive_im = 1;
        }
 }
 
 
-void citproto_begin_admin_session()
-{
+void citproto_begin_admin_session() {
        CC->internal_pgm = 1;
        cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, CtdlGetConfigStr("c_fqdn"));
 }
 
 
-/*
- * This loop performs all asynchronous functions.
- */
-void do_async_loop(void)
-{
+// This loop performs all asynchronous functions.
+void do_async_loop(void) {
        PerformSessionHooks(EVT_ASYNC);
 }