rssclient.c - dont compare null strings

[citadel.git] / citadel / modules / rssclient / serv_rssclient.c

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 7e5d03c40b2544fd0770c08bcff9446e4564c585..b9742266b7c654cf2f14895aee596b8ac196ecc7 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -436,13 +436,10 @@ eNextState RSSSaveMessage(AsyncIO *IO)
 
        if (rss_format_item(IO, RSSAggr->ThisMsg))
        {
-               CM_SetAsFieldSB(&RSSAggr->ThisMsg->Msg, eMesageText,
-                                      &RSSAggr->ThisMsg->Message);
-
+               CM_SetAsFieldSB(&RSSAggr->ThisMsg->Msg, eMesageText, &RSSAggr->ThisMsg->Message);
                CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
                
                /* write the uidl to the use table so we don't store this item again */
-               
                CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, EvGetNow(IO), 0, eWrite, CCID, IO->ID);
        }
 
@@ -794,19 +791,14 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
        while (RSSCfg != NULL)
        {
                pthread_mutex_lock(&RSSQueueMutex);
-               GetHash(RSSFetchUrls,
-                       SKEY(RSSCfg->Url),
-                       &vptr);
+               GetHash(RSSFetchUrls, SKEY(RSSCfg->Url), &vptr);
 
                use_this_RSSAggr = (rss_aggregator *)vptr;
                if (use_this_RSSAggr != NULL)
                {
                        pRSSConfig *pRSSCfg;
 
-                       StrBufAppendBufPlain(
-                               use_this_RSSAggr->rooms,
-                               qrbuf->QRname,
-                               -1, 0);
+                       StrBufAppendBufPlain(use_this_RSSAggr->rooms, qrbuf->QRname, -1, 0);
                        if (use_this_RSSAggr->roomlist_parts==1)
                        {
                                use_this_RSSAggr->OtherQRnumbers
@@ -893,12 +885,13 @@ void rssclient_scan(void) {
                              "rssclient: concurrency check failed; %d rooms and %d url's are queued",
                              RSSRoomCount, RSSCount
                        );
+               abort();
                return;
        }
 
        become_session(&rss_CC);
        EVRSSQM_syslog(LOG_DEBUG, "rssclient started");
-       CtdlForEachNetCfgRoom(rssclient_scan_room, NULL, rssclient);
+       CtdlForEachNetCfgRoom(rssclient_scan_room, NULL);
 
        if (GetCount(RSSFetchUrls) > 0)
        {
@@ -973,7 +966,7 @@ int RSSCheckUsetableVeto(StrBuf *ErrMsg)
        Info.Now = time (NULL);
        Info.Veto = 0;
 
-       CtdlForEachNetCfgRoom(rssclient_veto_scan_room, &Info, rssclient);
+       CtdlForEachNetCfgRoom(rssclient_veto_scan_room, &Info);
 
        return Info.Veto;;
 }