(popmail): Remove some unnecessary function

declarations.
(popmail, pop_retr): Since popmail always passes mbx_write and mbf
into pop_retr, there's no reason to pass in mbx_write, and the
file argument can be declared FILE * explicitly.  This fixes a
compilation problem on systems with 64-bit pointers.

1 files changed, 5 insertions, 6 deletions

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 6f22c19e389..4d824401349 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -679,9 +679,7 @@ popmail (user, outfile, preserve, password)
   int mbfi;
   FILE *mbf;
   char *getenv ();
-  int mbx_write ();
   popserver server;
-  extern char *strerror ();
 
   server = pop_open (0, user, password, POP_NO_GETPASS);
   if (! server)
@@ -723,7 +721,7 @@ popmail (user, outfile, preserve, password)
   for (i = 1; i <= nmsgs; i++)
     {
       mbx_delimit_begin (mbf);
-      if (pop_retr (server, i, mbx_write, mbf) != OK)
+      if (pop_retr (server, i, mbf) != OK)
         {
           error (Errmsg);
           close (mbfi);
@@ -780,9 +778,10 @@ popmail (user, outfile, preserve, password)
   return (0);
 }
 
-pop_retr (server, msgno, action, arg)
+int
+pop_retr (server, msgno, arg)
      popserver server;
-     int (*action) ();
+     FILE *arg;
 {
   extern char *strerror ();
   char *line;
@@ -800,7 +799,7 @@ pop_retr (server, msgno, action, arg)
       if (! line)
         break;
 
-      if ((*action)(line, arg) != OK)
+      if (mbx_write (line, arg) != OK)
         {
           strcpy (Errmsg, strerror (errno));
           pop_close (server);