X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Frss_atom_parser.c;h=cd4121d5d1172bb52392e553fc49a2feb720e726;hb=1493fd8ff0de73d30336607b43b1c8113ffcffa2;hp=681cf8a14eb59743c9074de2869e8abcf78ce32d;hpb=951fbe7c1ee0b3554af22d6ae0d1d51c1642ae0f;p=citadel.git

diff --git a/citadel/modules/rssclient/rss_atom_parser.c b/citadel/modules/rssclient/rss_atom_parser.c
index 681cf8a14..cd4121d5d 100644
--- a/citadel/modules/rssclient/rss_atom_parser.c
+++ b/citadel/modules/rssclient/rss_atom_parser.c
@@ -68,21 +68,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 +602,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);
 
@@ -675,7 +675,7 @@ void rss_remember_item(rss_item *ri, rss_aggregator *RSSAggr)
 	/* gather the cheaply computed information now... */
 
 	if (ri->guid != NULL) {
-		SaveMsg->Msg.cm_fields[eExclusiveID] = strdup(ChrPtr(ri->guid));
+		CM_SetField(&SaveMsg->Msg, eExclusiveID, SKEY(ri->guid));
 	}
 
 	SaveMsg->MsgGUID = guid;
@@ -683,12 +683,10 @@ void rss_remember_item(rss_item *ri, rss_aggregator *RSSAggr)
 	if (ri->pubdate <= 0) {
 		ri->pubdate = time(NULL); /// TODO: use event time!
 	}
-	SaveMsg->Msg.cm_fields[eTimestamp] = malloc(64);
-	snprintf(SaveMsg->Msg.cm_fields[eTimestamp], 64, "%ld", ri->pubdate);
+	CM_SetFieldLONG(&SaveMsg->Msg, eTimestamp, ri->pubdate);
 	if (ri->channel_title != NULL) {
 		if (StrLength(ri->channel_title) > 0) {
-			SaveMsg->Msg.cm_fields[eOriginalRoom] =
-				strdup(ChrPtr(ri->channel_title));
+			CM_SetField(&SaveMsg->Msg, eOriginalRoom, SKEY(ri->channel_title));
 		}
 	}