[Nmh-commits] nmh h/popsbr.h h/prototypes.h h/utils.h sbr/m_g...

[Joel Reicher]

CVSROOT:        /sources/nmh
Module name:    nmh
Changes by:     Joel Reicher <jjr>      07/11/08 02:28:39

Modified files:
        h              : popsbr.h prototypes.h utils.h 
        sbr            : m_getfld.c utils.c 
        uip            : popsbr.c 

Log message:
        Insert types for args of some function pointers to improve type 
checking.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/h/popsbr.h?cvsroot=nmh&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/nmh/h/prototypes.h?cvsroot=nmh&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/nmh/h/utils.h?cvsroot=nmh&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/m_getfld.c?cvsroot=nmh&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/utils.c?cvsroot=nmh&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/popsbr.c?cvsroot=nmh&r1=1.18&r2=1.19

Patches:
Index: h/popsbr.h
===================================================================
RCS file: /sources/nmh/nmh/h/popsbr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- h/popsbr.h  27 Jan 2005 16:34:20 -0000      1.4
+++ h/popsbr.h  8 Nov 2007 02:28:38 -0000       1.5
@@ -2,7 +2,7 @@
 /*
  * popsbr.h -- header for POP client subroutines
  *
- * $Id: popsbr.h,v 1.4 2005/01/27 16:34:20 opk Exp $
+ * $Id: popsbr.h,v 1.5 2007/11/08 02:28:38 jjr Exp $
  */
 
 #if 0
@@ -25,11 +25,11 @@
 int pop_init (char *, char *, char *, char *, int, int, int, int, char *);
 int pop_fd (char *, int, char *, int);
 int pop_stat (int *, int *);
-int pop_retr (int, int (*)());
+int pop_retr (int, int (*)(char *));
 int pop_dele (int);
 int pop_noop (void);
 int pop_rset (void);
-int pop_top (int, int, int (*)());
+int pop_top (int, int, int (*)(char *));
 int pop_quit (void);
 int pop_done (void);
 

Index: h/prototypes.h
===================================================================
RCS file: /sources/nmh/nmh/h/prototypes.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- h/prototypes.h      4 Nov 2007 04:47:17 -0000       1.19
+++ h/prototypes.h      8 Nov 2007 02:28:38 -0000       1.20
@@ -2,7 +2,7 @@
 /*
  * prototypes.h -- various prototypes
  *
- * $Id: prototypes.h,v 1.19 2007/11/04 04:47:17 jjr Exp $
+ * $Id: prototypes.h,v 1.20 2007/11/08 02:28:38 jjr Exp $
  */
 
 /*
@@ -71,7 +71,7 @@
 char *m_backup (char *);
 int m_convert (struct msgs *, char *);
 char *m_draft (char *, char *, int, int *);
-void m_eomsbr (int (*)());
+void m_eomsbr (int (*)(int));
 int m_getfld (int, unsigned char *, unsigned char *, int, FILE *);
 int m_gmprot (void);
 char *m_maildir (char *);

Index: h/utils.h
===================================================================
RCS file: /sources/nmh/nmh/h/utils.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- h/utils.h   21 Aug 2007 21:19:39 -0000      1.9
+++ h/utils.h   8 Nov 2007 02:28:38 -0000       1.10
@@ -2,7 +2,7 @@
 /*
  * utils.h -- utility prototypes
  *
- * $Id: utils.h,v 1.9 2007/08/21 21:19:39 bress Exp $
+ * $Id: utils.h,v 1.10 2007/11/08 02:28:38 jjr Exp $
  */
 
 void *mh_xmalloc(size_t);
@@ -10,7 +10,7 @@
 char *pwd(void);
 char *add(char *, char *);
 int folder_exists(char *);
-void create_folder(char *, int, void (*)());
+void create_folder(char *, int, void (*)(int));
 int num_digits(int);
 
 struct msgs_array {

Index: sbr/m_getfld.c
===================================================================
RCS file: /sources/nmh/nmh/sbr/m_getfld.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- sbr/m_getfld.c      2 Jan 2006 03:17:42 -0000       1.11
+++ sbr/m_getfld.c      8 Nov 2007 02:28:39 -0000       1.12
@@ -2,7 +2,7 @@
 /*
  * m_getfld.c -- read/parse a message
  *
- * $Id: m_getfld.c,v 1.11 2006/01/02 03:17:42 bress Exp $
+ * $Id: m_getfld.c,v 1.12 2007/11/08 02:28:39 jjr Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -183,7 +183,7 @@
 static unsigned char *edelim;
 static int edelimlen;
 
-static int (*eom_action)() = NULL;
+static int (*eom_action)(int) = NULL;
 
 #ifdef _FSTDIO
 # define _ptr    _p            /* Gag   */
@@ -596,7 +596,7 @@
 
 
 void
-m_eomsbr (int (*action)())
+m_eomsbr (int (*action)(int))
 {
     if ((eom_action = action)) {
        msg_style = MS_MSH;

Index: sbr/utils.c
===================================================================
RCS file: /sources/nmh/nmh/sbr/utils.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- sbr/utils.c 21 Aug 2007 21:19:39 -0000      1.10
+++ sbr/utils.c 8 Nov 2007 02:28:39 -0000       1.11
@@ -2,7 +2,7 @@
 /*
  * utils.c -- various utility routines
  *
- * $Id: utils.c,v 1.10 2007/08/21 21:19:39 bress Exp $
+ * $Id: utils.c,v 1.11 2007/11/08 02:28:39 jjr Exp $
  *
  * This code is Copyright (c) 2006, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -148,7 +148,7 @@
  *      Check to see if a folder exists, if not, prompt the user to create
  *      it.
  */
-void create_folder(char *folder, int autocreate, void (*done_callback)())
+void create_folder(char *folder, int autocreate, void (*done_callback)(int))
 {
     struct stat st;
     extern int errno;

Index: uip/popsbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/popsbr.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- uip/popsbr.c        29 Apr 2007 22:01:04 -0000      1.18
+++ uip/popsbr.c        8 Nov 2007 02:28:39 -0000       1.19
@@ -1,7 +1,7 @@
 /*
  * popsbr.c -- POP client subroutines
  *
- * $Id: popsbr.c,v 1.18 2007/04/29 22:01:04 pm215 Exp $
+ * $Id: popsbr.c,v 1.19 2007/11/08 02:28:39 jjr Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -104,7 +104,7 @@
 static int sasl_fgetc(FILE *);
 #endif /* CYRUS_SASL */
 
-static int traverse (int (*)(), const char *, ...);
+static int traverse (int (*)(char *), const char *, ...);
 static int vcommand(const char *, va_list);
 static int sasl_getline (char *, int, FILE *);
 static int putline (char *, FILE *);
@@ -823,7 +823,7 @@
 
 
 int
-pop_retr (int msgno, int (*action)())
+pop_retr (int msgno, int (*action)(char *))
 {
 #ifndef NNTP
     return traverse (action, "RETR %d", (targ_t) msgno);
@@ -834,7 +834,7 @@
 
 
 static int
-traverse (int (*action)(), const char *fmt, ...)
+traverse (int (*action)(char *), const char *fmt, ...)
 {
     int result;
     va_list ap;
@@ -895,7 +895,7 @@
 
 
 int
-pop_top (int msgno, int lines, int (*action)())
+pop_top (int msgno, int lines, int (*action)(char *))
 {
 #ifndef NNTP
     return traverse (action, "TOP %d %d", (targ_t) msgno, (targ_t) lines);