From 56a569ff306e08ecb5f8252a865617ed7e602a6a Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Wed, 10 Feb 2010 01:55:52 +0100 Subject: Refactoring: Rename smtp_open() to smtp_setup() --- fetchmail.h | 1 + odmr.c | 2 +- sink.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fetchmail.h b/fetchmail.h index c459bdca..d0991386 100644 --- a/fetchmail.h +++ b/fetchmail.h @@ -556,6 +556,7 @@ extern volatile int lastsig; /* sink.c: forwarding */ void smtp_close(struct query *, int); int smtp_open(struct query *); +int smtp_setup(struct query *); char *rcpt_address(struct query *, const char *, int); int stuffline(struct query *, char *); int open_sink(struct query*, struct msgblk *, int*, int*); diff --git a/odmr.c b/odmr.c index a20d89f1..907e0092 100644 --- a/odmr.c +++ b/odmr.c @@ -138,7 +138,7 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id, * instead, we'll use select(2) to watch the read sides of both * sockets and just throw their data at each other. */ - if ((smtp_sock = smtp_open(ctl)) == -1) + if ((smtp_sock = smtp_setup(ctl)) == -1) return(PS_SOCKET); else { diff --git a/sink.c b/sink.c index 8a0561f8..c5160364 100644 --- a/sink.c +++ b/sink.c @@ -76,7 +76,7 @@ static void smtp_rset(struct query *ctl) } } -int smtp_open(struct query *ctl) +int smtp_setup(struct query *ctl) /* try to open a socket to the appropriate SMTP server for this query */ { /* maybe it's time to close the socket in order to force delivery */ @@ -1276,7 +1276,7 @@ int open_sink(struct query *ctl, struct msgblk *msg, * open a socket fails, fall through to attempt delivery via * local MDA. */ - else if (!ctl->mda && smtp_open(ctl) != -1) + else if (!ctl->mda && smtp_setup(ctl) != -1) return(open_smtp_sink(ctl, msg, good_addresses, bad_addresses)); /* -- cgit v1.2.3