Minor cleanup of rss parser in preparation for some upcoming changes.

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

diff --git a/citadel/modules/rssclient/rss_atom_parser.c b/citadel/modules/rssclient/rss_atom_parser.c
index 254b6e5d70f48c82184080ae7a2975bcd786d2dc..fdba27577fb0008f61f16e94b02ade85d377588f 100644 (file)
--- a/citadel/modules/rssclient/rss_atom_parser.c
+++ b/citadel/modules/rssclient/rss_atom_parser.c
@@ -1,21 +1,15 @@
 /*
  * Bring external RSS feeds into rooms.
  *
- * Copyright (c) 2007-2012 by the citadel.org team
+ * Copyright (c) 2007-2015 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
  * 
- * 
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * 
- * 
- * 
  */
 
 #include <stdlib.h>
@@ -68,21 +62,21 @@ int RSSAtomParserDebugEnabled = 0;
 
 #define EVRSSATOM_syslog(LEVEL, FORMAT, ...)                           \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "IO[%ld]CC[%d][%ld]RSSP" FORMAT,           \
-                            IO->ID, CCID, N, __VA_ARGS__)
+                            "%s[%ld]CC[%d][%ld]RSSP" FORMAT,           \
+                            IOSTR, IO->ID, CCID, N, __VA_ARGS__)
 
 #define EVRSSATOMM_syslog(LEVEL, FORMAT)                               \
        DBGLOG(LEVEL) syslog(LEVEL,                                     \
-                            "IO[%ld]CC[%d][%ld]RSSP" FORMAT,           \
-                            IO->ID, CCID, N)
+                            "%s[%ld]CC[%d][%ld]RSSP" FORMAT,           \
+                            IOSTR, IO->ID, CCID, N)
 
 #define EVRSSATOMCS_syslog(LEVEL, FORMAT, ...)                 \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSSP" FORMAT,  \
-                            IO->ID, N, __VA_ARGS__)
+       DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSSP" FORMAT,  \
+                            IOSTR, IO->ID, N, __VA_ARGS__)
 
 #define EVRSSATOMSM_syslog(LEVEL, FORMAT)                      \
-       DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSSP" FORMAT,  \
-                            IO->ID, N)
+       DBGLOG(LEVEL) syslog(LEVEL, "%s[%ld][%ld]RSSP" FORMAT,  \
+                            IOSTR, IO->ID, N)
 
 /*
  * Convert an RDF/RSS datestamp into a time_t
@@ -602,7 +596,7 @@ void FreeNetworkSaveMessage (void *vMsg)
 {
        networker_save_message *Msg = (networker_save_message *) vMsg;
 
-       CtdlFreeMessageContents(&Msg->Msg);
+       CM_FreeContents(&Msg->Msg);
        FreeStrBuf(&Msg->Message);
        FreeStrBuf(&Msg->MsgGUID);
 
@@ -633,9 +627,7 @@ void rss_remember_item(rss_item *ri, rss_aggregator *RSSAggr)
        AsyncIO *IO = &RSSAggr->IO;
        int n;
 
-
-       SaveMsg = (networker_save_message *) malloc(
-               sizeof(networker_save_message));
+       SaveMsg = (networker_save_message *) malloc(sizeof(networker_save_message));
        memset(SaveMsg, 0, sizeof(networker_save_message));
 
        /* Construct a GUID to use in the S_USETABLE table.
@@ -650,16 +642,13 @@ void rss_remember_item(rss_item *ri, rss_aggregator *RSSAggr)
        else {
                MD5Init(&md5context);
                if (ri->title != NULL) {
-                       MD5Update(&md5context,
-                                 (const unsigned char*)SKEY(ri->title));
+                       MD5Update(&md5context, (const unsigned char*)SKEY(ri->title));
                }
                if (ri->link != NULL) {
-                       MD5Update(&md5context,
-                                 (const unsigned char*)SKEY(ri->link));
+                       MD5Update(&md5context, (const unsigned char*)SKEY(ri->link));
                }
                MD5Final(rawdigest, &md5context);
-               guid = NewStrBufPlain(NULL,
-                                     MD5_DIGEST_LEN * 2 + 12 /* _rss2ctdl*/);
+               guid = NewStrBufPlain(NULL, MD5_DIGEST_LEN * 2 + 12 /* _rss2ctdl*/);
                StrBufHexEscAppend(guid, NULL, rawdigest, MD5_DIGEST_LEN);
                StrBufAppendBufPlain(guid, HKEY("_rss2ctdl"), 0);
        }
@@ -681,7 +670,7 @@ void rss_remember_item(rss_item *ri, rss_aggregator *RSSAggr)
        SaveMsg->MsgGUID = guid;
 
        if (ri->pubdate <= 0) {
-               ri->pubdate = time(NULL); /// TODO: use event time!
+               ri->pubdate = time(NULL);
        }
        CM_SetFieldLONG(&SaveMsg->Msg, eTimestamp, ri->pubdate);
        if (ri->channel_title != NULL) {
@@ -955,15 +944,16 @@ eNextState RSSAggregator_ParseReply(AsyncIO *IO)
 
        RSSAggr->Pos = GetNewHashPos(RSSAggr->Messages, 1);
 
-//RSSAggr->next_poll = time(NULL) + config.c_net_freq;
        if (GetNextHashPos(RSSAggr->Messages,
                           RSSAggr->Pos,
                           &len,
                           &Key,
-                          (void**) &RSSAggr->ThisMsg))
+                          (void**) &RSSAggr->ThisMsg)) {
                return NextDBOperation(IO, RSS_FetchNetworkUsetableEntry);
-       else
+       }
+       else {
                return eAbort;
+       }
 }