From: David Levine <levinedl@acm.org>
Date: Sat, 2 Feb 2013 16:54:32 +0000 (-0600)
Subject: The Solaris compiler was right about unreachable statements.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/eb9d95f038fd0268a821ab332df24ce2592b7482?ds=sidebyside;hp=df6e7ebd567b8c815843682a2739009bac298b33

The Solaris compiler was right about unreachable statements.
Fixed all of them in uip/.
---

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index cf043c40..7c480e25 100644
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -123,7 +123,6 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
 	    	adios(NULL, "m_getfld() returned %d", state);
 	}
     }
-    m_getfld_state_destroy (&gstate);
 
     /*
      * Override any components just in case they were included in the
@@ -136,6 +135,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
      */
 
 finished:
+    m_getfld_state_destroy (&gstate);
 
     cptr = fmt_findcomp ("digest");
     if (cptr) {
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 4f12b6d6..8f46ebbb 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -1087,19 +1087,20 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 				break;
 			}
 		}
+		m_getfld_state_destroy (&gstate);
 		return;
 
 	    case LENERR: 
 	    case FMTERR: 
 		advise (NULL, "format error in message %s", mname);
 		exitstat++;
+		m_getfld_state_destroy (&gstate);
 		return;
 
 	    default: 
 		adios (NULL, "getfld() returned %d", state);
 	}
     }
-    m_getfld_state_destroy (&gstate);
 }
 
 
diff --git a/uip/replsbr.c b/uip/replsbr.c
index 087cbebe..25049af1 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -172,12 +172,12 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 		adios (NULL, "m_getfld() returned %d", state);
 	}
     }
-    m_getfld_state_destroy (&gstate);
 
     /*
      * format and output the header lines.
      */
 finished:
+    m_getfld_state_destroy (&gstate);
 
     /*
      * if there's a "Subject" component, strip any "Re:"s off it
diff --git a/uip/show.c b/uip/show.c
index 766aec94..f9978136 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -448,6 +448,7 @@ out:
 		free (cp);
 		if (result) {
 		    fclose (fp);
+		    m_getfld_state_destroy (&gstate);
 		    return result;
 		}
 		break;
@@ -475,6 +476,7 @@ out:
 		free (cp);
 		if (result) {
 		    fclose (fp);
+		    m_getfld_state_destroy (&gstate);
 		    return result;
 		}
 		break;
@@ -496,8 +498,8 @@ out:
 	     */
 	default:
 	    fclose (fp);
+	    m_getfld_state_destroy (&gstate);
 	    return 0;
 	}
     }
-    m_getfld_state_destroy (&gstate);
 }
diff --git a/uip/vmhsbr.c b/uip/vmhsbr.c
index eb6e0378..ca78c03f 100644
--- a/uip/vmhsbr.c
+++ b/uip/vmhsbr.c
@@ -155,11 +155,13 @@ str2peer (char code, char *str)
 int
 fmt2peer (char code, char *fmt, ...)
 {
+    int     return_value;
     va_list ap;
 
     va_start(ap, fmt);
-    return verr2peer (code, NULL, fmt, ap);
+    return_value = verr2peer (code, NULL, fmt, ap);
     va_end(ap);
+    return return_value;
 }
 
 
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 857161ab..90a2cf2e 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -940,6 +940,7 @@ check_draft (char *msgnam)
 		 */
 	        if (uprf (name, XXX_FIELD_PRF)) {
 		    fclose (fp);
+		    m_getfld_state_destroy (&gstate);
 		    return 0;
 		}
 		while (state == FLDPLUS) {
@@ -955,6 +956,7 @@ check_draft (char *msgnam)
 		    for (bp = buf; *bp; bp++)
 			if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
 			    fclose (fp);
+			    m_getfld_state_destroy (&gstate);
 			    return 1;
 			}
 
@@ -965,10 +967,10 @@ check_draft (char *msgnam)
 
 	    default:
 		fclose (fp);
+		m_getfld_state_destroy (&gstate);
 		return 0;
 	}
     }
-    m_getfld_state_destroy (&gstate);
 }