Reformat else-if that are split over two or more lines into one.

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 71405616cba9a7b0f5bd4b5a1008d936e36a0353..0eb474aec53938167a1f6194bc9c42d4d2629ece 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -2110,9 +2110,8 @@ openQuoted (CT ct, char **file)
                   sizeof digest))
            content_error (NULL, ct,
                           "content integrity suspect (digest mismatch) -- continuing");
                   sizeof digest))
            content_error (NULL, ct,
                           "content integrity suspect (digest mismatch) -- continuing");

-       else
-           if (debugsw)
-               fprintf (stderr, "content integrity confirmed\n");
+       else if (debugsw)
+            fprintf (stderr, "content integrity confirmed\n");

     }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);


@@ -2416,12 +2415,10 @@ openFile (CT ct, char **file)
            if (ferror (gp)) {
                admonish (ce->ce_file, "error reading");
                (void) m_unlink (cachefile);
            if (ferror (gp)) {
                admonish (ce->ce_file, "error reading");
                (void) m_unlink (cachefile);

-           }
-           else
-               if (ferror (fp)) {
-                   admonish (cachefile, "error writing");
-                   (void) m_unlink (cachefile);
-               }
+           } else if (ferror (fp)) {
+                admonish (cachefile, "error writing");
+                (void) m_unlink (cachefile);
+            }

            fclose (fp);
        }
        umask (mask);
            fclose (fp);
        }
        umask (mask);


@@ -2627,12 +2624,10 @@ openFTP (CT ct, char **file)
                if (ferror (gp)) {
                    admonish (ce->ce_file, "error reading");
                    (void) m_unlink (cachefile);
                if (ferror (gp)) {
                    admonish (ce->ce_file, "error reading");
                    (void) m_unlink (cachefile);

-               }
-               else
-                   if (ferror (fp)) {
-                       admonish (cachefile, "error writing");
-                       (void) m_unlink (cachefile);
-                   }
+               } else if (ferror (fp)) {
+                    admonish (cachefile, "error writing");
+                    (void) m_unlink (cachefile);
+                }

                fclose (fp);
            }
            umask (mask);
                fclose (fp);
            }
            umask (mask);