[Nmh-commits] nmh sbr/fmt_scan.c sbr/m_draft.c uip/folder.c u...

[Joel Reicher]

CVSROOT:        /sources/nmh
Module name:    nmh
Branch:         
Changes by:     Joel Reicher <address@hidden>   06/04/14 07:54:26

Modified files:
        sbr            : fmt_scan.c m_draft.c 
        uip            : folder.c inc.c refile.c 

Log message:
        Get rid of some trivial warnings; unused variables, ambiguous if-else,
        missing headers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/fmt_scan.c.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/m_draft.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/folder.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/inc.c.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/refile.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: nmh/sbr/fmt_scan.c
diff -u nmh/sbr/fmt_scan.c:1.22 nmh/sbr/fmt_scan.c:1.23
--- nmh/sbr/fmt_scan.c:1.22     Wed Jan 18 17:07:28 2006
+++ nmh/sbr/fmt_scan.c  Fri Apr 14 07:54:26 2006
@@ -2,7 +2,7 @@
 /*
  * fmt_scan.c -- format string interpretation
  *
- * $Id: fmt_scan.c,v 1.22 2006/01/18 17:07:28 opk Exp $
+ * $Id: fmt_scan.c,v 1.23 2006/04/14 07:54:26 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
@@ -359,11 +359,12 @@
 
        case FT_NUM:
            n = snprintf(cp, ep - cp + 1, "%d", value);
-           if (n >= 0)
+           if (n >= 0) {
                if (n >= ep - cp) {
                    cp = ep;
                } else
                    cp += n;
+           }
            break;
        case FT_NUMF:
            cpnumber (&cp, value, fmt->f_width, fmt->f_fill, ep - cp);
Index: nmh/sbr/m_draft.c
diff -u nmh/sbr/m_draft.c:1.4 nmh/sbr/m_draft.c:1.5
--- nmh/sbr/m_draft.c:1.4       Mon Feb 20 03:09:08 2006
+++ nmh/sbr/m_draft.c   Fri Apr 14 07:54:26 2006
@@ -2,7 +2,7 @@
 /*
  * m_draft.c -- construct the name of a draft message
  *
- * $Id: m_draft.c,v 1.4 2006/02/20 03:09:08 bress Exp $
+ * $Id: m_draft.c,v 1.5 2006/04/14 07:54:26 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
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <errno.h>
 
 
@@ -18,7 +19,6 @@
 {
     register char *cp;
     register struct msgs *mp;
-    struct stat st;
     static char buffer[BUFSIZ];
 
     if (*isdf == -1 || folder == NULL || *folder == '\0') {
Index: nmh/uip/folder.c
diff -u nmh/uip/folder.c:1.10 nmh/uip/folder.c:1.11
--- nmh/uip/folder.c:1.10       Tue Feb 21 01:11:51 2006
+++ nmh/uip/folder.c    Fri Apr 14 07:54:26 2006
@@ -4,7 +4,7 @@
  *             -- push/pop a folder onto/from the folder stack
  *             -- list the folder stack
  *
- * $Id: folder.c,v 1.10 2006/02/21 01:11:51 bress Exp $
+ * $Id: folder.c,v 1.11 2006/04/14 07:54:26 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
@@ -135,7 +135,6 @@
     int pushsw = 0, popsw = 0;
     char *cp, *dp, *msg = NULL, *argfolder = NULL;
     char **ap, **argp, buf[BUFSIZ], **arguments;
-    struct stat st;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
Index: nmh/uip/inc.c
diff -u nmh/uip/inc.c:1.21 nmh/uip/inc.c:1.22
--- nmh/uip/inc.c:1.21  Mon Feb 20 03:09:08 2006
+++ nmh/uip/inc.c       Fri Apr 14 07:54:26 2006
@@ -2,7 +2,7 @@
 /*
  * inc.c -- incorporate messages from a maildrop into a folder
  *
- * $Id: inc.c,v 1.21 2006/02/20 03:09:08 bress Exp $
+ * $Id: inc.c,v 1.22 2006/04/14 07:54:26 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
@@ -29,6 +29,7 @@
 #endif
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <fcntl.h>
 
 #ifdef POP
Index: nmh/uip/refile.c
diff -u nmh/uip/refile.c:1.11 nmh/uip/refile.c:1.12
--- nmh/uip/refile.c:1.11       Tue Apr 11 14:09:11 2006
+++ nmh/uip/refile.c    Fri Apr 14 07:54:26 2006
@@ -3,7 +3,7 @@
  * refile.c -- move or link message(s) from a source folder
  *          -- into one or more destination folders
  *
- * $Id: refile.c,v 1.11 2006/04/11 14:09:11 jjr Exp $
+ * $Id: refile.c,v 1.12 2006/04/14 07:54:26 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
@@ -278,11 +278,9 @@
 static void
 opnfolds (struct st_fold *folders, int nfolders)
 {
-    register char *cp;
     char nmaildir[BUFSIZ];
     register struct st_fold *fp, *ep;
     register struct msgs *mp;
-    struct stat st;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
        chdir (m_maildir (""));