Get rid of some trivial warnings; unused variables, ambiguous if-else,

missing headers.

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 8475d50e3bbebca160269a6a3478673c2dee9a09..b212b1264dd04846cb49320a60e3baa3777c0f1c 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -359,11 +359,12 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        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);

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index b0168e2ec43ab3532cdaefca1c7b568c1ffc308a..d3e988edd5925d4527b6b733f6e2949a6bf29a3c 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <errno.h>
 
 
@@ -18,7 +19,6 @@ m_draft (char *folder, char *msg, int use, int *isdf)
 {
     register char *cp;
     register struct msgs *mp;
-    struct stat st;
     static char buffer[BUFSIZ];
 
     if (*isdf == -1 || folder == NULL || *folder == '\0') {

diff --git a/uip/folder.c b/uip/folder.c
index b332af06110b092534c4e33a81f54318457f0047..98c66ed627db5e72f169c82d15f07d6f2eccbe6a 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -135,7 +135,6 @@ main (int argc, char **argv)
     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, "");

diff --git a/uip/inc.c b/uip/inc.c
index 0731a1571227d224ecae6036a2b5c56e422471bf..aee194aa39c6ab3539e8d3afe60494ddf2bdb696 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -29,6 +29,7 @@
 #endif
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <fcntl.h>
 
 #ifdef POP

diff --git a/uip/refile.c b/uip/refile.c
index acafbf433a867e08d40193e31d721dd4c29e2810..e77fe0b18230a372ac2c8526dd79338ef050bde0 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -278,11 +278,9 @@ main (int argc, char **argv)
 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 (""));