From: David Levine <levinedl@acm.org>
Date: Sat, 19 Oct 2013 14:58:14 +0000 (-0500)
Subject: Added volatile qualifier in a couple of places to get rid of
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/fc69a9cd8f854da20fc2f4cf99fcf726958485f5?ds=sidebyside;hp=--cc

Added volatile qualifier in a couple of places to get rid of
"might be clobbered" warning from when -Wno-clobbered isn't
supported.  And I removed the check for Wno-clobbered from
configure.ac.  It's no longer needed on any of the platforms
I use, we'll see if others need it.
---

fc69a9cd8f854da20fc2f4cf99fcf726958485f5
diff --git a/configure.ac b/configure.ac
index aa5f75ff..fac9b91b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,12 +106,6 @@ AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
  AC_TRY_COMPILE([],[],nmh_cv_has_wextra=yes,nmh_cv_has_wextra=no)
  CFLAGS="$nmh_saved_cflags"])
 
-AC_CACHE_CHECK([whether compiler supports -Wno-clobbered], [nmh_cv_has_noclobbered],
-[nmh_saved_cflags="$CFLAGS"
- CFLAGS="$CFLAGS -Wno-clobbered -Werror"
- AC_TRY_COMPILE([],[],nmh_cv_has_noclobbered=yes,nmh_cv_has_noclobbered=no)
- CFLAGS="$nmh_saved_cflags"])
-
 dnl Can't use -ansi with gcc 4.5.3 on Cygwin, at least through setup
 dnl setup version 2.763, because it disables some features in the
 dnl system system header files and warns about them with -Wall.  Try
@@ -147,9 +141,6 @@ fi
 if test "$nmh_cv_has_wextra" = "yes"; then
     nmh_gcc_warnflags="${nmh_gcc_warnflags} -Wextra"
 fi
-if test "$nmh_cv_has_noclobbered" = "yes"; then
-    nmh_gcc_warnflags="${nmh_gcc_warnflags} -Wno-clobbered"
-fi
 
 if test -n "$auto_cflags"; then
   if test x"$enable_debug" = x"yes"; then
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 82e65d77..8d759d65 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -877,6 +877,8 @@ process (char *folder, char *fname, int ofilen, int ofilec)
     struct mcomp *c1;
     struct stat st;
     struct arglist *ap;
+    /* volatile to prevent "might be clobbered" warning from gcc: */
+    char *volatile fname2 = fname ? fname : "(stdin)";
 
     switch (setjmp (env)) {
 	case OK: 
@@ -888,7 +890,6 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 		    return;
 		}
 	    } else {
-		fname = "(stdin)";
 		fp = stdin;
 	    }
 	    if (fstat(fileno(fp), &st) == 0) {
@@ -896,7 +897,7 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 	    } else {
 	    	filesize = 0;
 	    }
-	    cp = folder ? concat (folder, ":", fname, NULL) : getcpy (fname);
+	    cp = folder ? concat (folder, ":", fname2, NULL) : getcpy (fname2);
 	    if (ontty != PITTY)
 		SIGNAL (SIGINT, intrser);
 	    mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 6282d522..e91c74c2 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -183,7 +183,9 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
-    int bytes, fd, seconds;
+    int bytes, seconds;
+    /* volatile to prevent "might be clobbered" warning from gcc: */
+    volatile int fd;
     char tmpfil[BUFSIZ];
     struct stat st;