fix formating; use define for size_t arguments.

[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 ed79adb8b5316ea1c6a547abc37ccbfe6a8e0a86..61ccbc992bdbd0847b4d5b0ba538c60f13377dfb 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -106,12 +106,11 @@ void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos
 
 void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
 {
-/*
-       if (rncfg->RNCfg->sender != NULL)
-               continue; / * just one alowed... * /
-       extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-       rncfg->RNCfg->sender = nptr;
-*/
+       if (rncfg->Sender != NULL)
+               return;
+
+       ParseGeneric(ThisOne, Line, LinePos, rncfg);
+       rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]);
 }
 
 void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
@@ -234,11 +233,11 @@ void CalcListID(SpoolControl *sc)
        assoc_file_name(filename, sizeof filename, &sc->room, ctdl_info_dir);
        fd = open(filename, 0);
 
-       if (fd != 0) {
+       if (fd > 0) {
                struct stat stbuf;
 
-               fstat(fd, &stbuf);
-               if (stbuf.st_size > 0)
+               if ((fstat(fd, &stbuf) == 0) &&
+                   (stbuf.st_size > 0))
                {
                        sc->RoomInfo = NewStrBufPlain(NULL, stbuf.st_size + 1);
                        StrBufReadBLOB(sc->RoomInfo, &fd, 0, stbuf.st_size, &err);
@@ -924,6 +923,11 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
                        do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
                        if (err == NULL) {
                                unlink(filename);
+                               QN_syslog(LOG_DEBUG,
+                                         "Spoolfile %s now "SIZE_T_FMT" k\n",
+                                         spooloutfilename,
+                                         (dsize + fsize)/1024
+                                       );                              
                        }
                        else {
                                nFailed++;
@@ -1017,6 +1021,21 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
        closedir(dp);
 }
 
+void free_spoolcontrol_struct(SpoolControl **sc)
+{
+       free_spoolcontrol_struct_members(*sc);
+       free(*sc);
+       *sc = NULL;
+}
+
+void free_spoolcontrol_struct_members(SpoolControl *sc)
+{
+       int i;
+       FreeStrBuf(&sc->RoomInfo);
+       FreeStrBuf(&sc->ListID);
+       for (i = 0; i < maxRoomNetCfg; i++)
+               FreeStrBuf(&sc->Users[i]);
+}