From 8a0176e1ef5612725f97baec519775c72468ab55 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Thu, 6 Mar 2014 20:15:45 -0600
Subject: [PATCH] Fixed a few very minor issues that cppcheck noticed.

---
 etc/gen-ctype-checked.c | 14 +++++++++-----
 sbr/folder_delmsgs.c    |  4 +++-
 uip/mkstemp.c           |  4 +++-
 uip/sortm.c             |  1 +
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/etc/gen-ctype-checked.c b/etc/gen-ctype-checked.c
index f1dcaf01..befd64a7 100644
--- a/etc/gen-ctype-checked.c
+++ b/etc/gen-ctype-checked.c
@@ -74,10 +74,11 @@ main () {
  */\n\n";
     char headername[] = "sbr/ctype-checked.h";
     const char cfilename[] =  "sbr/ctype-checked.c";
-    FILE *header, *cfile;
+    FILE *header = fopen (headername, "w");
+    FILE *cfile = fopen (cfilename, "w");
+    int status = 0;
 
-    if ((header = fopen (headername, "w")) != 0  &&
-        (cfile = fopen (cfilename, "w")) != 0) {
+    if (header != 0  &&  cfile != 0) {
         struct ctype_func *f;
 
         fprintf (header, copyright, headername);
@@ -121,8 +122,11 @@ main () {
         fprintf (header, "#endif /* CTYPE_CHECKED_H */\n");
     } else {
         perror ("fopen in sbr/");
-        return -1;
+        status = -1;
     }
 
-    return 0;
+    if (header) { fclose(header); }
+    if (cfile) { fclose(cfile); }
+
+    return status;
 }
diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index db593f80..ebbca2d4 100644
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * 1) If we are using an external rmmproc, then exec it.
@@ -56,7 +57,8 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
 	 */
 
 	if (mp->numsel + vecp + 1 > MAXARGS)
-	    vec = (char **) realloc (vec, (size_t) ((mp->numsel + vecp + 1) *
+	    vec = (char **) mh_xrealloc (vec,
+                                         (size_t) ((mp->numsel + vecp + 1) *
 						     sizeof(*vec)));
 	if (vec == NULL)
 	    adios (NULL, "unable to allocate exec vector");
diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index 16ddf644..d594c362 100644
--- a/uip/mkstemp.c
+++ b/uip/mkstemp.c
@@ -48,7 +48,9 @@ main(int argc, char *argv[]) {
     if ((suffix_len = strlen(suffix)) > 0) {
 #       if HAVE_MKSTEMPS
         if ((fd = mkstemps(template, suffix_len)) < 0) { perror("mkstemps"); }
-#       endif /* HAVE_MKSTEMPS */
+#       else  /* ! HAVE_MKSTEMPS */
+        fd = 0;
+#       endif /* ! HAVE_MKSTEMPS */
     } else {
         if ((fd = mkstemp(template)) < 0) { perror("mkstemp"); }
     }
diff --git a/uip/sortm.c b/uip/sortm.c
index 3df18859..84a49394 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -287,6 +287,7 @@ main (int argc, char **argv)
 	    }
 	}
 	*fp = 0;
+	free (il);
 	free (slist);
 	free (dlist);
 	dlist = flist;
-- 
2.56.0