fix more merge hickups

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 06b391e4b769c7a6bad254952a97abd682e1595c..d1e03c4b2875f5b66248261972e218d280191ce6 100644 (file)
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -1097,7 +1097,7 @@ void pop3client_scan(void) {
 void pop3_cleanup(void)
 {
        /* citthread_mutex_destroy(&POP3QueueMutex); TODO */
-       DeleteHash(&POP3FetchUrls);
+//     DeleteHash(&POP3FetchUrls);
        DeleteHash(&POP3QueueRooms);
 }
 

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 93af337862f8fce2a3248a7e908482924498c3b8..9973a1e3404dc493931790aa5e78d124a3599908 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -490,11 +490,12 @@ void DeleteRssCfg(void *vptr)
 eNextState RSSAggregatorTerminate(AsyncIO *IO)
 {
        rss_aggregator *rncptr = (rss_aggregator *)IO->Data;
-       HashPos *At;
-       long HKLen;
-       const char *HK;
-       void *vData;
-
+       /*
+         HashPos *At;
+         long HKLen;
+         const char *HK;
+         void *vData;
+       */
        pthread_mutex_lock(&RSSQueueMutex);
        rncptr->RefCount --;
        if (rncptr->RefCount == 0)
@@ -522,7 +523,7 @@ eNextState RSSAggregatorTerminate(AsyncIO *IO)
  */
 void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 {
-       StrBuf *CfgData;
+       StrBuf *CfgData=NULL;
        StrBuf *CfgType;
        StrBuf *Line;
        rss_room_counter *Count = NULL;
@@ -561,9 +562,19 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
        }
 
        if (server_shutting_down)
-               return
+               return;
+
+       if (fstat(fd, &statbuf) == -1) {
+               syslog(LOG_DEBUG, "ERROR: could not stat configfile '%s' - %s\n",
+                      filename, strerror(errno));
+               return;
+       }
+
+       if (server_shutting_down)
+               return;
 
        CfgData = NewStrBufPlain(NULL, statbuf.st_size + 1);
+
        if (StrBufReadBLOB(CfgData, &fd, 1, statbuf.st_size, &Err) < 0) {
                close(fd);
                FreeStrBuf(&CfgData);

diff --git a/citadel/threads.c b/citadel/threads.c
index fc960da18e01d6c80b17b8902878f98f8621fd57..59aae25d27f88bd44e3d1749ed75875ce3967421 100644 (file)
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -157,6 +157,7 @@ void *CTC_backend(void *supplied_start_routine)
 
        start_routine(NULL);
 
+       free(mytsd);
        return(NULL);
 }