war on BSD style curly braces

[citadel.git] / citadel / modules / network / serv_netspool.c

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 141dd565a3b60ccb352cc9675b785ae9219b35f3..5055eabfa0bd9230a4bad7355dac7426c03b1b74 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -2,7 +2,7 @@
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
- * Copyright (c) 2000-2018 by the citadel.org team
+ * Copyright (c) 2000-2020 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.
@@ -76,24 +76,11 @@
 #include "citadel_dirs.h"
 #include "threads.h"
 #include "context.h"
-
 #include "ctdl_module.h"
-
 #include "netspool.h"
 #include "netmail.h"
 
 
-#ifndef DT_UNKNOWN
-#define DT_UNKNOWN     0
-#define DT_DIR         4
-#define DT_REG         8
-#define DT_LNK         10
-
-#define IFTODT(mode)   (((mode) & 0170000) >> 12)
-#define DTTOIF(dirtype)        ((dirtype) << 12)
-#endif
-
-
 void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
 {
        RoomNetCfgLine *nptr;
@@ -159,29 +146,12 @@ int HaveSpoolConfig(OneRoomNetCfg* RNCfg)
        return interested;
 }
 
-void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen)
-{
-       long node_len;
-       char buf[SIZ];
-
-       /* prepend our node to the path */
-       if (CM_IsEmpty(msg, eMessagePath)) {
-               CM_SetField(msg, eMessagePath, defl, defllen);
-       }
-       node_len = strlen(CtdlGetConfigStr("c_nodename"));
-       if (node_len >= SIZ) 
-               node_len = SIZ - 1;
-       memcpy(buf, CtdlGetConfigStr("c_nodename"), node_len);
-       buf[node_len] = '!';
-       buf[node_len + 1] = '\0';
-       CM_PrependToField(msg, eMessagePath, buf, node_len + 1);
-}
 
 void InspectQueuedRoom(SpoolControl **pSC,
                       RoomProcList *room_to_spool,     
                       HashList *working_ignetcfg,
-                      HashList *the_netmap)
-{
+                      HashList *the_netmap
+) {
        SpoolControl *sc;
        int i = 0;
 
@@ -247,7 +217,7 @@ void CalcListID(SpoolControl *sc)
 #define MAX_LISTIDLENGTH 150
 
        // Load the room banner as the list description
-       struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1, 1);
+       struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1);
         if (msg != NULL) {
                CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
                 CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0);
@@ -306,7 +276,7 @@ void CalcListID(SpoolControl *sc)
                /*
                 * this used to be:
                 * roomname <Room-Number.list-id.fqdn>
-                * according to rfc2919.txt it only has to be a uniq identifier
+                * according to rfc2919.txt it only has to be a unique identifier
                 * under the domain of the system; 
                 * in general MUAs use it to calculate the reply address nowadays.
                 */
@@ -375,7 +345,6 @@ void network_spoolout_room(SpoolControl *sc)
                if (isspace(buf[i])) buf[i] = '_';
        }
 
-
        /* If we wrote a digest, deliver it and then close it */
        if ( (sc->Users[digestrecp] != NULL) && (sc->digestfp != NULL) )
        {
@@ -437,10 +406,6 @@ void create_spool_dirs(void) {
                syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno));
        if (chown(ctdl_nettmp_dir, CTDLUID, (-1)) != 0)
                syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
-       if ((mkdir(ctdl_netout_dir, 0700) != 0) && (errno != EEXIST))
-               syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno));
-       if (chown(ctdl_netout_dir, CTDLUID, (-1)) != 0)
-               syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno));
 }