From a8381ce990f0eaa1379ecb9d7352a2e54a53cc63 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 1 Apr 2016 18:18:17 -0400 Subject: [PATCH] rssclient.c - dont compare null strings --- citadel/modules/inetcfg/serv_inetcfg.c | 5 ++++- citadel/modules/rssclient/serv_rssclient.c | 15 +++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/citadel/modules/inetcfg/serv_inetcfg.c b/citadel/modules/inetcfg/serv_inetcfg.c index 615a48b42..cf81a8f5b 100644 --- a/citadel/modules/inetcfg/serv_inetcfg.c +++ b/citadel/modules/inetcfg/serv_inetcfg.c @@ -92,7 +92,10 @@ int inetcfg_aftersave(struct CtdlMessage *msg, recptypes *recp) { /* If this isn't the configuration room, or if this isn't a MIME * message, don't bother. */ - if (strcasecmp(msg->cm_fields[eOriginalRoom], SYSCONFIGROOM)) return(0); + if ((msg->cm_fields[eOriginalRoom]) && (strcasecmp(msg->cm_fields[eOriginalRoom], SYSCONFIGROOM))) + { + return(0); + } if (msg->cm_format_type != 4) return(0); ptr = msg->cm_fields[eMesageText]; diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index e482fff07..b9742266b 100644 --- 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); } @@ -793,21 +790,15 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR while (RSSCfg != NULL) { - // syslog(LOG_DEBUG, "\033[32m RSSCfg %s for %s %d \033[0m", ((RSSCfg == NULL) ? "IS NULL" : "IS NOT NULL"), qrbuf->QRname, __LINE__); 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 -- 2.30.2