From: Art Cancro <ajc@citadel.org>
Date: Mon, 20 Sep 2010 17:34:08 +0000 (-0400)
Subject: More of the same.  I think it's time to reduce complexity here.
X-Git-Tag: v8.01~702^2~5
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;ds=sidebyside;h=3d0059e4b0486a07f88e59d9d7c42b1471650cfa;p=citadel.git

More of the same.  I think it's time to reduce complexity here.
---

diff --git a/citadel/modules/extnotify/extnotify_main.c b/citadel/modules/extnotify/extnotify_main.c
index 1ceca2ca8..3e80ef4d7 100644
--- a/citadel/modules/extnotify/extnotify_main.c
+++ b/citadel/modules/extnotify/extnotify_main.c
@@ -136,11 +136,11 @@ StrBuf** GetNotifyHosts(void)
 }
 
 
-/*! \brief Create the notify message queue. We use the exact same room
- *			as the Funambol module.
+/* Create the notify message queue. We use the exact same room
+ * as the Funambol module.
  *
- *	Run at server startup, creates FNBL_QUEUE_ROOM if it doesn't exist
- *	and sets as system room.
+ * Run at server startup, creates FNBL_QUEUE_ROOM if it doesn't exist
+ * and sets as system room.
  */
 void create_extnotify_queue(void) {
 	struct ctdlroom qrbuf;
@@ -165,7 +165,6 @@ void do_extnotify_queue(void)
 	NotifyContext Ctx;
 	static int doing_queue = 0;
 	int i = 0;
-	CitContext extnotifyCC;
     
 	/*
 	 * This is a simple concurrency check to make sure only one queue run
@@ -176,10 +175,6 @@ void do_extnotify_queue(void)
 	if (doing_queue) return;
 	doing_queue = 1;
 
-	/* Give this thread its own private CitContext */
-	CtdlFillSystemContext(&extnotifyCC, "extnotify");
-	citthread_setspecific(MyConKey, (void *)&extnotifyCC );
-    
 	/*
 	 * Go ahead and run the queue
 	 */
@@ -220,10 +215,10 @@ void do_extnotify_queue(void)
 
 	CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: queue run completed\n");
 	doing_queue = 0;
-	CtdlClearSystemContext();
 }
-/*!
- * \brief Process messages in the external notification queue
+
+/*
+ * Process messages in the external notification queue
  */
 void process_notify(long NotifyMsgnum, void *usrdata) 
 {
diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index c6b349c6c..0b2eb99be 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -306,11 +306,6 @@ void pop3client_scan(void) {
 	static int doing_pop3client = 0;
 	struct pop3aggr *pptr;
 	time_t fastest_scan;
-	CitContext popclientCC;
-
-	/* Give this thread its own private CitContext */
-	CtdlFillSystemContext(&popclientCC, "popclient");
-	citthread_setspecific(MyConKey, (void *)&popclientCC );
 
 	if (config.c_pop3_fastest < config.c_pop3_fetch)
 		fastest_scan = config.c_pop3_fastest;
@@ -349,7 +344,6 @@ void pop3client_scan(void) {
 	CtdlLogPrintf(CTDL_DEBUG, "pop3client ended\n");
 	last_run = time(NULL);
 	doing_pop3client = 0;
-	CtdlClearSystemContext();
 }
 
 
diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 049f8801c..0d8442b41 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1269,11 +1269,6 @@ void rssclient_scan(void *args) {
 	static time_t last_run = 0L;
 	static int doing_rssclient = 0;
 	rssnetcfg *rptr = NULL;
-	CitContext rssclientCC;
-
-	/* Give this thread its own private CitContext */
-	CtdlFillSystemContext(&rssclientCC, "rssclient");
-	citthread_setspecific(MyConKey, (void *)&rssclientCC );
 
 	/*
 	 * This is a simple concurrency check to make sure only one rssclient run
@@ -1298,7 +1293,6 @@ void rssclient_scan(void *args) {
 	CtdlLogPrintf(CTDL_DEBUG, "rssclient ended\n");
 	last_run = time(NULL);
 	doing_rssclient = 0;
-	CtdlClearSystemContext();
 	return NULL;
 }