From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 6 Sep 2011 15:24:58 +0000 (+0000)
Subject: fix more merge hickups
X-Git-Tag: v8.11~494
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=607094868c16b6a850d3c46892d5199a3403a848

fix more merge hickups
---

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 06b391e4b..d1e03c4b2 100644
--- 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 93af33786..9973a1e34 100644
--- 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 fc960da18..59aae25d2 100644
--- 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);
 }