From 25b2680056454dc4761ba3b2efde7c3414738f8c Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 17 Dec 2020 12:24:50 +0100 Subject: mail: move "opts" from globals function old new delta popmaildir_main 812 823 +11 sendmail_main 1295 1301 +6 makemime_main 291 288 -3 parse 970 966 -4 reformime_main 107 100 -7 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/3 up/down: 17/-14) Total: 3 bytes Signed-off-by: Denys Vlasenko --- mailutils/popmaildir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mailutils/popmaildir.c') diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c index c5522f1b7..4f2d4124d 100644 --- a/mailutils/popmaildir.c +++ b/mailutils/popmaildir.c @@ -71,7 +71,7 @@ static void pop3_checkr(const char *fmt, const char *param, char **ret) char *answer = xmalloc_fgetline(stdin); if (answer && '+' == answer[0]) { free(msg); - if (timeout) + if (G.timeout) alarm(0); if (ret) { // skip "+OK " @@ -92,6 +92,7 @@ static void pop3_check(const char *fmt, const char *param) int popmaildir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int popmaildir_main(int argc UNUSED_PARAM, char **argv) { + unsigned opts; char *buf; unsigned nmsg; char *hostname; @@ -128,7 +129,7 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv) opts = getopt32(argv, "^" "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:") "\0" "-1:dd", - &timeout, NULL, NULL, NULL, &opt_nlines + &G.timeout, NULL, NULL, NULL, &opt_nlines IF_FEATURE_POPMAILDIR_DELIVERY(, &delivery, &delivery) // we treat -M and -F the same ); //argc -= optind; -- cgit v1.2.3