From 7d73cad8f21f305358cf040ef184706e327090ef Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sun, 20 Apr 2008 19:23:25 +0000
Subject: [PATCH] * fixed several compiler warnings.

---
 citadel/modules/extnotify/extnotify.h      |  2 +-
 citadel/modules/extnotify/extnotify_main.c | 13 +++++++------
 citadel/modules/rssclient/serv_rssclient.c |  4 ++--
 citadel/modules/vcard/serv_vcard.c         |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/citadel/modules/extnotify/extnotify.h b/citadel/modules/extnotify/extnotify.h
index e25650eb0..5cecb46e2 100644
--- a/citadel/modules/extnotify/extnotify.h
+++ b/citadel/modules/extnotify/extnotify.h
@@ -17,7 +17,7 @@ extern "C" {
 
 int notify_funambol_server(char *user);
 
-char *extNotify_getPrefs(long configMsgNum, char *configMsg);
+void extNotify_getPrefs(long configMsgNum, char *configMsg);
 long extNotify_getConfigMessage(char *username);
 void process_notify(long msgnum, void *usrdata);
 
diff --git a/citadel/modules/extnotify/extnotify_main.c b/citadel/modules/extnotify/extnotify_main.c
index fb6823da4..06c6699c6 100644
--- a/citadel/modules/extnotify/extnotify_main.c
+++ b/citadel/modules/extnotify/extnotify_main.c
@@ -115,7 +115,7 @@ void process_notify(long msgnum, void *usrdata) {
     long configMsgNum = extNotify_getConfigMessage(msg->cm_fields['W']);
     char configMsg[SIZ];
     
-    extNotify_getPrefs(configMsgNum, &configMsg);
+    extNotify_getPrefs(configMsgNum, &configMsg[0]);
     
     /* Check to see if:
      * 1. The user has configured paging / They have and disabled it
@@ -123,8 +123,10 @@ void process_notify(long msgnum, void *usrdata) {
      * 3. A Funambol server has been entered
      *
      */
-    if ((configMsgNum == -1) || (strncasecmp(configMsg, "none", 4) == 0) &&
-    IsEmptyStr(config.c_pager_program) && IsEmptyStr(config.c_funambol_host)) {
+    if ((configMsgNum == -1) || 
+	((strncasecmp(configMsg, "none", 4) == 0) &&
+	 IsEmptyStr(config.c_pager_program) && 
+	 IsEmptyStr(config.c_funambol_host))) {
         CtdlLogPrintf(CTDL_DEBUG, "No external notifiers configured on system/user");
         goto nuke;
     }
@@ -152,18 +154,17 @@ void process_notify(long msgnum, void *usrdata) {
 /*! \brief Checks to see what notification option the user has set
  *
  */
-char *extNotify_getPrefs(long configMsgNum, char *configMsg) {
+void extNotify_getPrefs(long configMsgNum, char *configMsg) {
     // Do a simple string search to see if 'funambol' is selected as the
     // type. This string would be at the very top of the message contents.
     if (configMsgNum == -1) {
         CtdlLogPrintf(CTDL_ERR, "extNotify_isAllowedByPrefs was passed a non-existant config message id\n");
-        return "none";
+        return;
     }
     struct CtdlMessage *prefMsg;
     prefMsg = CtdlFetchMessage(configMsgNum, 1);
     strncpy(configMsg, prefMsg->cm_fields['M'], strlen(prefMsg->cm_fields['M']));
     CtdlFreeMessage(prefMsg);
-    return configMsg;
 }
 /*! \brief Get configuration message for pager/funambol system from the
  *			users "My Citadel Config" room
diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 605b0772d..e97a59dcb 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -97,10 +97,10 @@ void rss_save_item(struct rss_item *ri) {
 	else {
 		MD5Init(&md5context);
 		if (ri->title != NULL) {
-			MD5Update(&md5context, ri->title, strlen(ri->title));
+			MD5Update(&md5context, (unsigned char*)ri->title, strlen(ri->title));
 		}
 		if (ri->link != NULL) {
-			MD5Update(&md5context, ri->link, strlen(ri->link));
+			MD5Update(&md5context, (unsigned char*)ri->link, strlen(ri->link));
 		}
 		MD5Final(rawdigest, &md5context);
 		for (i=0; i<MD5_DIGEST_LEN; i++) {
diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index d7f3c8af6..7180cd668 100644
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -991,7 +991,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
 	/* If using host auth mode, we add an email address based on the login */
 	if (config.c_auth_mode == AUTHMODE_HOST) {
 		struct passwd pwd;
-		struct passwd **result;
+		struct passwd **result = NULL;
 		char pwd_buffer[SIZ];
 
 		if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, result) == 0) {
-- 
2.30.2