projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d9c2f2b
)
fix warnings in libev related codebase
author
Wilfried Goesgens
<dothebart@citadel.org>
Wed, 7 Sep 2011 14:58:31 +0000
(14:58 +0000)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Wed, 7 Sep 2011 14:58:31 +0000
(14:58 +0000)
citadel/modules/smtp/serv_smtpeventclient.c
patch
|
blob
|
history
citadel/modules/smtp/smtp_util.c
patch
|
blob
|
history
citadel/modules/urldeshortener/serv_expand_shorter_urls.c
patch
|
blob
|
history
diff --git
a/citadel/modules/smtp/serv_smtpeventclient.c
b/citadel/modules/smtp/serv_smtpeventclient.c
index 831857b07a28c703effbf0e2f7e39dd06f4e6e72..029236a9aaed529d25bf7e376c83a14c4cf87160 100644
(file)
--- 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:
break;
case eSendDNSQuery:
case eReadDNSReply:
+ case eDBQuery:
+ case eReadMore:
+ case eReadPayload:
case eConnect:
case eTerminateConnection:
case eAbort:
case eConnect:
case eTerminateConnection:
case eAbort:
diff --git
a/citadel/modules/smtp/smtp_util.c
b/citadel/modules/smtp/smtp_util.c
index 9e215c07455176cc298a52d337239f9c5d6c4262..1db154635cc84e30b92499d20a00e136b8401351 100644
(file)
--- 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;
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;
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 */
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");
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) {
/* 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 6b038bec12556e3f42664af651c0a0b2dc4ba344..d13d1e9582edcd443e6e888a8791537ba4adccf4 100644
(file)
--- 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
eNextState TerminateLookupUrl(AsyncIO *IO)
{
//TOOD
+ return eAbort;
}
eNextState LookupUrlResult(AsyncIO *IO)
{
}
eNextState LookupUrlResult(AsyncIO *IO)
{