smtp-multi.c: Minor coding style tidyup following POP3 and IMAP additions
This commit is contained in:
@@ -78,19 +78,19 @@ static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp)
|
|||||||
|
|
||||||
static struct timeval tvnow(void)
|
static struct timeval tvnow(void)
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
** time() returns the value of time in seconds since the Epoch.
|
|
||||||
*/
|
|
||||||
struct timeval now;
|
struct timeval now;
|
||||||
|
|
||||||
|
/* time() returns the value of time in seconds since the epoch */
|
||||||
now.tv_sec = (long)time(NULL);
|
now.tv_sec = (long)time(NULL);
|
||||||
now.tv_usec = 0;
|
now.tv_usec = 0;
|
||||||
|
|
||||||
return now;
|
return now;
|
||||||
}
|
}
|
||||||
|
|
||||||
static long tvdiff(struct timeval newer, struct timeval older)
|
static long tvdiff(struct timeval newer, struct timeval older)
|
||||||
{
|
{
|
||||||
return (newer.tv_sec-older.tv_sec)*1000+
|
return (newer.tv_sec - older.tv_sec) * 1000 +
|
||||||
(newer.tv_usec-older.tv_usec)/1000;
|
(newer.tv_usec - older.tv_usec) / 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
@@ -150,15 +150,15 @@ int main(void)
|
|||||||
|
|
||||||
while(still_running) {
|
while(still_running) {
|
||||||
struct timeval timeout;
|
struct timeval timeout;
|
||||||
int rc; /* select() return code */
|
|
||||||
|
|
||||||
fd_set fdread;
|
fd_set fdread;
|
||||||
fd_set fdwrite;
|
fd_set fdwrite;
|
||||||
fd_set fdexcep;
|
fd_set fdexcep;
|
||||||
int maxfd = -1;
|
int maxfd = -1;
|
||||||
|
int rc;
|
||||||
|
|
||||||
long curl_timeo = -1;
|
long curl_timeo = -1;
|
||||||
|
|
||||||
|
/* Initialise the file descriptors */
|
||||||
FD_ZERO(&fdread);
|
FD_ZERO(&fdread);
|
||||||
FD_ZERO(&fdwrite);
|
FD_ZERO(&fdwrite);
|
||||||
FD_ZERO(&fdexcep);
|
FD_ZERO(&fdexcep);
|
||||||
@@ -187,17 +187,16 @@ int main(void)
|
|||||||
rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
|
rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
|
||||||
|
|
||||||
if(tvdiff(tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) {
|
if(tvdiff(tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) {
|
||||||
fprintf(stderr, "ABORTING TEST, since it seems "
|
fprintf(stderr,
|
||||||
"that it would have run forever.\n");
|
"ABORTING: Since it seems that we would have run forever.\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch(rc) {
|
switch(rc) {
|
||||||
case -1:
|
case -1: /* select error */
|
||||||
/* select error */
|
|
||||||
break;
|
break;
|
||||||
case 0: /* timeout */
|
case 0: /* timeout */
|
||||||
default: /* action */
|
default: /* action */
|
||||||
curl_multi_perform(mcurl, &still_running);
|
curl_multi_perform(mcurl, &still_running);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user