From eade1ff7a96d62e0c50e5dc26b1d5bf85e1666cd Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 15 May 2013 01:29:48 +0200 Subject: [PATCH] TDAP: align rss config structs with the primary type. --- citadel/modules/rssclient/rss_atom_parser.h | 2 +- citadel/modules/rssclient/serv_rssclient.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/citadel/modules/rssclient/rss_atom_parser.h b/citadel/modules/rssclient/rss_atom_parser.h index 07df846f4..acddbe919 100644 --- a/citadel/modules/rssclient/rss_atom_parser.h +++ b/citadel/modules/rssclient/rss_atom_parser.h @@ -81,9 +81,9 @@ typedef struct __networker_save_message { typedef struct RSSCfgLine RSSCfgLine; struct RSSCfgLine { + RSSCfgLine *next; StrBuf *Url; time_t last_known_good; - RSSCfgLine *Next; }; typedef struct __pRSSConfig { diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index b2a069fd6..b4e59452f 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -464,7 +464,7 @@ void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now) if (RSSCfg == pCfg->pCfg) break; - RSSCfg = RSSCfg->Next; + RSSCfg = RSSCfg->next; } if (RSSCfg != NULL) { @@ -695,7 +695,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR pthread_mutex_unlock(&RSSQueueMutex); - RSSCfg = RSSCfg->Next; + RSSCfg = RSSCfg->next; continue; } pthread_mutex_unlock(&RSSQueueMutex); @@ -722,7 +722,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR DeleteRssCfg); pthread_mutex_unlock(&RSSQueueMutex); - RSSCfg = RSSCfg->Next; + RSSCfg = RSSCfg->next; } } @@ -830,7 +830,7 @@ void rssclient_veto_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg StrBufAppendBuf(Info->ErrMsg, RSSCfg->Url, 0); StrBufAppendBufPlain(Info->ErrMsg, HKEY(">\n"), 0); } - RSSCfg = RSSCfg->Next; + RSSCfg = RSSCfg->next; } } @@ -862,7 +862,7 @@ void ParseRSSClientCfgLine(const CfgLineType *ThisOne, StrBuf *Line, const char RSSCfg->last_known_good = StrBufExtractNext_long(Line, &LinePos, '|'); - RSSCfg->Next = (RSSCfgLine *)OneRNCFG->NetConfigs[ThisOne->C]; + RSSCfg->next = (RSSCfgLine *)OneRNCFG->NetConfigs[ThisOne->C]; OneRNCFG->NetConfigs[ThisOne->C] = (RoomNetCfgLine*) RSSCfg; } -- 2.30.2