From e1241b61d2f8d7935670c36ab5fb4e10262514a6 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 7 Sep 2011 14:58:31 +0000 Subject: [PATCH] fix warnings in libev related codebase --- citadel/modules/smtp/serv_smtpeventclient.c | 3 +++ citadel/modules/smtp/smtp_util.c | 9 +++------ .../modules/urldeshortener/serv_expand_shorter_urls.c | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index 831857b07..029236a9a 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -530,6 +530,9 @@ void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *pMsg) break; case eSendDNSQuery: case eReadDNSReply: + case eDBQuery: + case eReadMore: + case eReadPayload: case eConnect: case eTerminateConnection: case eAbort: diff --git a/citadel/modules/smtp/smtp_util.c b/citadel/modules/smtp/smtp_util.c index 9e215c074..1db154635 100644 --- a/citadel/modules/smtp/smtp_util.c +++ b/citadel/modules/smtp/smtp_util.c @@ -116,7 +116,6 @@ void smtp_do_bounce(char *instr, StrBuf *OMsgTxt) StrBuf *boundary; int num_bounces = 0; int bounce_this = 0; - long bounce_msgid = (-1); time_t submitted = 0L; struct CtdlMessage *bmsg = NULL; int give_up = 0; @@ -258,12 +257,10 @@ void smtp_do_bounce(char *instr, StrBuf *OMsgTxt) if (num_bounces > 0) { /* First try the user who sent the message */ - syslog(LOG_DEBUG, "bounce to user? <%s>\n", bounceto); - if (IsEmptyStr(bounceto)) { + if (IsEmptyStr(bounceto)) syslog(LOG_ERR, "No bounce address specified\n"); - bounce_msgid = (-1L); - } - + else + syslog(LOG_DEBUG, "bounce to user <%s>\n", bounceto); /* Can we deliver the bounce to the original sender? */ valid = validate_recipients(bounceto, smtp_get_Recipients (), 0); if (valid != NULL) { diff --git a/citadel/modules/urldeshortener/serv_expand_shorter_urls.c b/citadel/modules/urldeshortener/serv_expand_shorter_urls.c index 6b038bec1..d13d1e958 100644 --- a/citadel/modules/urldeshortener/serv_expand_shorter_urls.c +++ b/citadel/modules/urldeshortener/serv_expand_shorter_urls.c @@ -96,6 +96,7 @@ size_t GetLocationString( void *ptr, size_t size, size_t nmemb, void *userdata) eNextState TerminateLookupUrl(AsyncIO *IO) { //TOOD + return eAbort; } eNextState LookupUrlResult(AsyncIO *IO) { -- 2.30.2