From 5bbed890029e6b965a32317763ef33c9b3178550 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Fri, 11 Jun 2004 19:42:04 +0000 Subject: Quench some GCC 3.4 warnings by making sure that all int arguments are marked int and swapping words so that static is first in the line. svn path=/trunk/; revision=3882 --- driver.c | 4 ++-- etrn.c | 2 +- getpass.c | 6 +++--- imap.c | 2 +- odmr.c | 2 +- pop3.c | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/driver.c b/driver.c index e2ee2787..ed58fcd8 100644 --- a/driver.c +++ b/driver.c @@ -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; diff --git a/etrn.c b/etrn.c index f7d4d48a..dacd700a 100644 --- a/etrn.c +++ b/etrn.c @@ -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 diff --git a/getpass.c b/getpass.c index c34f7686..8fe34e5d 100644 --- a/getpass.c +++ b/getpass.c @@ -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) diff --git a/imap.c b/imap.c index b667c4a6..5d977061 100644 --- a/imap.c +++ b/imap.c @@ -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 diff --git a/odmr.c b/odmr.c index 29d3d865..a7a3ad69 100644 --- a/odmr.c +++ b/odmr.c @@ -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 diff --git a/pop3.c b/pop3.c index a3d2d63f..67f7ced1 100644 --- a/pop3.c +++ b/pop3.c @@ -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 -- cgit v1.2.3