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 cf043c40b2bbba6d74b7ae7d165913d98debddcd..7c480e25000cb9ecf953bda228c605446aca5262 100644 (file)
--- 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);
        }
     }
                adios(NULL, "m_getfld() returned %d", state);
        }
     }

-    m_getfld_state_destroy (&gstate);

 
     /*
      * Override any components just in case they were included in the
 
     /*
      * 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:
      */
 
 finished:

+    m_getfld_state_destroy (&gstate);

 
     cptr = fmt_findcomp ("digest");
     if (cptr) {
 
     cptr = fmt_findcomp ("digest");
     if (cptr) {

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 4f12b6d61b830b3ebb04fa0727a769643b66de61..8f46ebbb8bc1deff9ea64d04838b59c0b1ede4db 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -1087,19 +1087,20 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                                break;
                        }
                }
                                break;
                        }
                }

+               m_getfld_state_destroy (&gstate);

                return;
 
            case LENERR: 
            case FMTERR: 
                advise (NULL, "format error in message %s", mname);
                exitstat++;
                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);
        }
     }
                return;
 
            default: 
                adios (NULL, "getfld() returned %d", state);
        }
     }

-    m_getfld_state_destroy (&gstate);

 }
 
 
 }
 
 

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 087cbebedbe00d600aa13afcd9bbf5b61db669d8..25049af17d19e7b2dc2697fb980160302fc47b81 100644 (file)
--- 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);
        }
     }
                adios (NULL, "m_getfld() returned %d", state);
        }
     }

-    m_getfld_state_destroy (&gstate);

 
     /*
      * format and output the header lines.
      */
 finished:
 
     /*
      * format and output the header lines.
      */
 finished:

+    m_getfld_state_destroy (&gstate);

 
     /*
      * if there's a "Subject" component, strip any "Re:"s off it
 
     /*
      * if there's a "Subject" component, strip any "Re:"s off it

diff --git a/uip/show.c b/uip/show.c
index 766aec947906f1a1dea3adeb7b5ba4add31dfe83..f9978136ca2b5505f3e3903331df52917746b151 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -448,6 +448,7 @@ out:
                free (cp);
                if (result) {
                    fclose (fp);
                free (cp);
                if (result) {
                    fclose (fp);

+                   m_getfld_state_destroy (&gstate);

                    return result;
                }
                break;
                    return result;
                }
                break;


@@ -475,6 +476,7 @@ out:
                free (cp);
                if (result) {
                    fclose (fp);
                free (cp);
                if (result) {
                    fclose (fp);

+                   m_getfld_state_destroy (&gstate);

                    return result;
                }
                break;
                    return result;
                }
                break;


@@ -496,8 +498,8 @@ out:
             */
        default:
            fclose (fp);
             */
        default:
            fclose (fp);

+           m_getfld_state_destroy (&gstate);

            return 0;
        }
     }
            return 0;
        }
     }

-    m_getfld_state_destroy (&gstate);

 }
 }

diff --git a/uip/vmhsbr.c b/uip/vmhsbr.c
index eb6e037875e72ba69ef81673fb148c05dd8f5fe6..ca78c03f1aa853b83a82e05dfe6b3faeff68532e 100644 (file)
--- a/uip/vmhsbr.c
+++ b/uip/vmhsbr.c
@@ -155,11 +155,13 @@ str2peer (char code, char *str)
 int
 fmt2peer (char code, char *fmt, ...)
 {
 int
 fmt2peer (char code, char *fmt, ...)
 {

+    int     return_value;

     va_list ap;
 
     va_start(ap, fmt);
     va_list ap;
 
     va_start(ap, fmt);

-    return verr2peer (code, NULL, fmt, ap);
+    return_value = verr2peer (code, NULL, fmt, ap);

     va_end(ap);
     va_end(ap);

+    return return_value;

 }
 
 
 }
 
 

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 857161ab0cbc5a735452c486a35f0afb97d636af..90a2cf2e26cf3b1c3b7f2f22e573cd9d2ce10a35 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -940,6 +940,7 @@ check_draft (char *msgnam)
                 */
                if (uprf (name, XXX_FIELD_PRF)) {
                    fclose (fp);
                 */
                if (uprf (name, XXX_FIELD_PRF)) {
                    fclose (fp);

+                   m_getfld_state_destroy (&gstate);

                    return 0;
                }
                while (state == FLDPLUS) {
                    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);
                    for (bp = buf; *bp; bp++)
                        if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
                            fclose (fp);

+                           m_getfld_state_destroy (&gstate);

                            return 1;
                        }
 
                            return 1;
                        }
 


@@ -965,10 +967,10 @@ check_draft (char *msgnam)
 
            default:
                fclose (fp);
 
            default:
                fclose (fp);

+               m_getfld_state_destroy (&gstate);

                return 0;
        }
     }
                return 0;
        }
     }

-    m_getfld_state_destroy (&gstate);

 }
 
 
 }