prototypes.h: Delete default_done() prototype.

[nmh] / uip / picksbr.c

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 2eddab7f1262910f2ad30e14d30c61b3e9d14358..4d4d99a1de3bdd7c9bddd066c1c958f9dfa8e347 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -644,21 +644,23 @@ cerror: ;
 static int
 GREPaction(struct nexus *n, FILE *fp, int msgnum, long start, long stop)
 {
-    int c, body, lf;
+    int c;
+    bool body;
+    bool lf;
     long pos = start;
     char *p1, *p2, *ebp, *cbp;
     char ibuf[BUFSIZ];
     NMH_UNUSED (msgnum);
 
     fseek (fp, start, SEEK_SET);
-    body = 0;
+    body = false;
     ebp = cbp = ibuf;
     for (;;) {
        if (body && n->n_header)
            return 0;
        p1 = linebuf;
        p2 = cbp;
-       lf = 0;
+       lf = false;
        for (;;) {
            if (p2 >= ebp) {
                if (fgets (ibuf, sizeof ibuf, fp) == NULL
@@ -677,16 +679,16 @@ GREPaction(struct nexus *n, FILE *fp, int msgnum, long start, long stop)
                    --p2;
                    break;
                }
-                lf = 0;
+                lf = false;
            }
            if (c == '\n') {
                if (body)
                    break;
                 if (lf) {
-                    body++;
+                    body = true;
                     break;
                 }
-                lf++;
+                lf = true;
                 /* Unfold by skipping the newline. */
                 c = 0;
            }
@@ -701,7 +703,7 @@ GREPaction(struct nexus *n, FILE *fp, int msgnum, long start, long stop)
 
        /* Attempt to decode as a MIME header.  If it's the last header,
           body will be 1 and lf will be at least 1. */
-       if ((body == 0 || lf > 0)  &&
+       if ((!body || lf)  &&
            decode_rfc2047 (linebuf, decoded_linebuf, sizeof decoded_linebuf)) {
            p1 = decoded_linebuf;
        }
@@ -958,7 +960,7 @@ TWSaction(struct nexus *n, FILE *fp, int msgnum, long start, long stop)
                return 0;
 
            default: 
-               adios (NULL, "internal error -- you lose");
+               die("internal error -- you lose");
        }
        break;
     }