Replace some ints that are only ever 0 or 1 with bool.

[nmh] / sbr / fmt_rfc2047.c

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 2f2c3c4f47cb7cb6e9ee012e4aff2dcc60be8b40..d98b50081ce3dd1abe7e3a870c8241a5264027ab 100644 (file)
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -11,7 +11,7 @@
 #  include <iconv.h>
 #endif
 
 #  include <iconv.h>
 #endif
 

-static signed char hexindex[] = {
+static const signed char hexindex[] = {

     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,


@@ -30,7 +30,7 @@ static signed char hexindex[] = {
     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 };
 
     -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
 };
 

-static signed char index_64[128] = {
+static const signed char index_64[128] = {

     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,


@@ -52,7 +52,7 @@ decode_qp (unsigned char byte1, unsigned char byte2)
 {
     if (hexindex[byte1] == -1 || hexindex[byte2] == -1)
        return -1;
 {
     if (hexindex[byte1] == -1 || hexindex[byte2] == -1)
        return -1;

-    return (hexindex[byte1] << 4 | hexindex[byte2]);
+    return hexindex[byte1] << 4 | hexindex[byte2];

 }
 
 /* Check if character is linear whitespace */
 }
 
 /* Check if character is linear whitespace */


@@ -73,11 +73,8 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
     char *startofmime, *endofmime, *endofcharset;
     int c, quoted_printable;
     int encoding_found = 0;    /* did we decode anything?                */
     char *startofmime, *endofmime, *endofcharset;
     int c, quoted_printable;
     int encoding_found = 0;    /* did we decode anything?                */

-    int between_encodings = 0; /* are we between two encodings?          */
-    int equals_pending = 0;    /* is there a '=' pending?                */

     int whitespace = 0;                /* how much whitespace between encodings? */
 #ifdef HAVE_ICONV
     int whitespace = 0;                /* how much whitespace between encodings? */
 #ifdef HAVE_ICONV

-    int use_iconv = 0;          /* are we converting encoding with iconv? */

     iconv_t cd = NULL;
     int fromutf8 = 0;
     char *saveq, *convbuf = NULL;
     iconv_t cd = NULL;
     int fromutf8 = 0;
     char *saveq, *convbuf = NULL;


@@ -94,13 +91,16 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
     if (!strchr (str, '='))
        return 0;
 
     if (!strchr (str, '='))
        return 0;
 

+    bool use_iconv = false; /* are we converting encoding with iconv? */
+    bool between_encodings = false;
+    bool equals_pending = false;

     for (p = str, q = dst; *p; p++) {
 
         /* reset iconv */
 #ifdef HAVE_ICONV
         if (use_iconv) {
            iconv_close(cd);
     for (p = str, q = dst; *p; p++) {
 
         /* reset iconv */
 #ifdef HAVE_ICONV
         if (use_iconv) {
            iconv_close(cd);

-           use_iconv = 0;
+           use_iconv = false;

         }
 #endif
        /*
         }
 #endif
        /*


@@ -109,8 +109,8 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
         */
        if (equals_pending) {
            ADDCHR('=');
         */
        if (equals_pending) {
            ADDCHR('=');

-           equals_pending = 0;
-           between_encodings = 0;      /* we have added non-whitespace text */
+           equals_pending = false;
+           between_encodings = false;  /* we have added non-whitespace text */

        }
 
        if (*p != '=') {
        }
 
        if (*p != '=') {


@@ -118,15 +118,15 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
            if (between_encodings && is_lws(*p))
                whitespace++;
            else
            if (between_encodings && is_lws(*p))
                whitespace++;
            else

-               between_encodings = 0;  /* we have added non-whitespace text */
+               between_encodings = false;      /* we have added non-whitespace text */

            ADDCHR(*p);
            continue;
        }
 
            ADDCHR(*p);
            continue;
        }
 

-       equals_pending = 1;     /* we have a '=' pending */
+       equals_pending = true;

 
        /* Check for initial =? */
 
        /* Check for initial =? */

-       if (*p == '=' && p[1] && p[1] == '?' && p[2]) {
+       if (*p == '=' && p[1] == '?' && p[2]) {

            startofmime = p + 2;
 
            /* Scan ahead for the next '?' character */
            startofmime = p + 2;
 
            /* Scan ahead for the next '?' character */


@@ -159,7 +159,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
                fromutf8 = !strcasecmp(startofmime, "UTF-8");
                *pp = '?';
                 if (cd == (iconv_t)-1) continue;
                fromutf8 = !strcasecmp(startofmime, "UTF-8");
                *pp = '?';
                 if (cd == (iconv_t)-1) continue;

-               use_iconv = 1;
+               use_iconv = true;

 #else
                continue;
 #endif
 #else
                continue;
 #endif


@@ -203,7 +203,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
             * We've found an encoded word, so we can drop
             * the '=' that was pending
             */
             * We've found an encoded word, so we can drop
             * the '=' that was pending
             */

-           equals_pending = 0;
+           equals_pending = false;

 
            /*
             * If we are between two encoded words separated only by
 
            /*
             * If we are between two encoded words separated only by


@@ -222,14 +222,14 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
             * malloc 0 bytes but skip on to the end
             */
            if (endofmime == startofmime && use_iconv) {
             * malloc 0 bytes but skip on to the end
             */
            if (endofmime == startofmime && use_iconv) {

-               use_iconv = 0;
+               use_iconv = false;

                iconv_close(cd);
             }
 
            if (use_iconv) {
                saveq = q;
                savedstlen = dstlen;
                iconv_close(cd);
             }
 
            if (use_iconv) {
                saveq = q;
                savedstlen = dstlen;

-                q = convbuf = (char *) mh_xmalloc(endofmime - startofmime);
+                q = convbuf = mh_xmalloc(endofmime - startofmime);

             }
 /* ADDCHR2 is for adding characters when q is or might be convbuf:
  * in this case on buffer-full we want to run iconv before returning.
             }
 /* ADDCHR2 is for adding characters when q is or might be convbuf:
  * in this case on buffer-full we want to run iconv before returning.


@@ -355,7 +355,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
            p = endofmime + 1;
 
            encoding_found = 1;         /* we found (at least 1) encoded word */
            p = endofmime + 1;
 
            encoding_found = 1;         /* we found (at least 1) encoded word */

-           between_encodings = 1;      /* we have just decoded something     */
+           between_encodings = true;   /* we have just decoded something     */

            whitespace = 0;             /* re-initialize amount of whitespace */
        }
     }
            whitespace = 0;             /* re-initialize amount of whitespace */
        }
     }