diff options
-rw-r--r-- | driver.c | 4 | ||||
-rw-r--r-- | etrn.c | 2 | ||||
-rw-r--r-- | getpass.c | 6 | ||||
-rw-r--r-- | imap.c | 2 | ||||
-rw-r--r-- | odmr.c | 2 | ||||
-rw-r--r-- | pop3.c | 4 |
6 files changed, 10 insertions, 10 deletions
@@ -69,8 +69,8 @@ int batchcount; /* count of messages sent in current batch */ flag peek_capable; /* can we peek for better error recovery? */ int mailserver_socket_temp = -1; /* socket to free if connect timeout */ -volatile static int timeoutcount = 0; /* count consecutive timeouts */ -volatile static int idletimeout = 0; /* timeout occured in idle stage? */ +static volatile int timeoutcount = 0; /* count consecutive timeouts */ +static volatile int idletimeout = 0; /* timeout occured in idle stage? */ static jmp_buf restart; @@ -119,7 +119,7 @@ static int etrn_logout(int sock, struct query *ctl) return(gen_transact(sock, "QUIT")); } -const static struct method etrn = +static const struct method etrn = { "ETRN", /* ESMTP ETRN extension */ #if INET6_ENABLE @@ -56,9 +56,9 @@ static int ttyfd; #endif #endif -void static save_tty_state(void); -void static disable_tty_echo(void); -void static restore_tty_state(void); +static void save_tty_state(void); +static void disable_tty_echo(void); +static void restore_tty_state(void); static RETSIGTYPE sigint_handler(int); char *fm_getpassword(prompt) @@ -1110,7 +1110,7 @@ static int imap_logout(int sock, struct query *ctl) return(gen_transact(sock, "LOGOUT")); } -const static struct method imap = +static const struct method imap = { "IMAP", /* Internet Message Access Protocol */ #if INET6_ENABLE @@ -207,7 +207,7 @@ static int odmr_logout(int sock, struct query *ctl) return(PS_SUCCESS); } -const static struct method odmr = +static const struct method odmr = { "ODMR", /* ODMR protocol */ #if INET6_ENABLE @@ -219,7 +219,7 @@ static int pop3_ok (int sock, char *argbuf) -static int capa_probe(sock) +static int capa_probe(int sock) /* probe the capabilities of the remote server */ { int ok; @@ -1179,7 +1179,7 @@ static int pop3_logout(int sock, struct query *ctl) return(ok); } -const static struct method pop3 = +static const struct method pop3 = { "POP3", /* Post Office Protocol v3 */ #if INET6_ENABLE |