Make Maillennium POP3 workarounds less specific,

[~andy/fetchmail] / getpass.c

diff --git a/getpass.c b/getpass.c
index c34f7686b3a7f5f95de1da70d83bbe571d902d44..3c19ba7c832fb9f3825c3b98c6d29e7cd5024351 100644 (file)
--- a/getpass.c
+++ b/getpass.c
@@ -56,13 +56,12 @@ 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)
-char *prompt;
+char *fm_getpassword(char *prompt)
 {
 #if !(defined(HAVE_TCSETATTR) || defined(HAVE_TERMIO_H) || defined(HAVE_STTY))
 #if defined(HAVE_GETPASS) 
@@ -78,7 +77,6 @@ char *prompt;
     FILE *fi;
     static char pbuf[INPUT_BUF_SIZE];
     SIGHANDLERTYPE sig = 0;    /* initialization pacifies -Wall */
-    RETSIGTYPE sigint_handler(int);
 
     int istty = isatty(0);
 
@@ -190,6 +188,7 @@ static void restore_tty_state(void)
 
 static RETSIGTYPE sigint_handler(int signum)
 {
+    (void)signum;
     restore_tty_state();
     report(stderr, GT_("\nCaught SIGINT... bailing out.\n"));
     exit(1);