From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 3 Oct 2010 09:14:07 +0000 (+0200)
Subject: * add additional chars for shorter url detection
X-Git-Tag: v8.01~252^2~428
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=5aabd613e7ebfaba95909143f41397e4b39614fc;p=citadel.git

* add additional chars for shorter url detection
* fix some warnings
---

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index f91c6ccd5..db78af8db 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -346,7 +346,7 @@ int LookupUrl(StrBuf *ShorterUrlStr)
 	CURL *curl;
 	char errmsg[1024] = "";
 	StrBuf *Answer;
-	int rc;
+	int rc = 0;
 
 	curl = curl_easy_init();
 	if (!curl) {
@@ -424,7 +424,7 @@ void CrawlMessageForShorterUrls(HashList *pUrls, StrBuf *Message)
 
 			pCUrl->Key = pUrl;
 			pch = pUrl + strlen(pShortenerService);
-			while (isalnum(*pch))
+			while (isalnum(*pch)||(*pch == '-')||(*pch == '/'))
 				pch++;
 			pCUrl->len = pch - pCUrl->Key;
 
@@ -1287,7 +1287,7 @@ size_t rss_libcurl_callback(void *ptr, size_t size, size_t nmemb, void *stream)
 void rss_do_fetching(rssnetcfg *Cfg) {
 	rsscollection rssc;
 	rss_item ri;
-	XML_Parser xp;
+	XML_Parser xp = NULL;
 	StrBuf *Answer;
 
 	CURL *curl;
@@ -1505,7 +1505,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data)
 /*
  * Scan for rooms that have RSS client requests configured
  */
-void rssclient_scan(void *args) {
+void rssclient_scan(void) {
 	static time_t last_run = 0L;
 	static int doing_rssclient = 0;
 	rssnetcfg *rptr = NULL;
@@ -1516,7 +1516,7 @@ void rssclient_scan(void *args) {
 	 * don't really require extremely fine granularity here, we'll do it
 	 * with a static variable instead.
 	 */
-	if (doing_rssclient) return NULL;
+	if (doing_rssclient) return;
 	doing_rssclient = 1;
 
 	CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
@@ -1533,7 +1533,7 @@ void rssclient_scan(void *args) {
 	CtdlLogPrintf(CTDL_DEBUG, "rssclient ended\n");
 	last_run = time(NULL);
 	doing_rssclient = 0;
-	return NULL;
+	return;
 }