X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/92c3b05ef3e582d64b3cecfc261fdd66ef13a4ef..080568bfb0056607359204678f84d23c74f02832:/sbr/encode_rfc2047.c?ds=sidebyside

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index 0ded2e93..be74c67c 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -160,7 +160,7 @@ static int
 field_encode_quoted(const char *name, char **value, const char *charset,
 		    int ascii, int encoded, int phraserules)
 {
-    int prefixlen = name ? strlen(name) + 2: 0, outlen = 0, column, newline = 1;
+    int prefixlen = name ? strlen(name) + 2: 0, outlen = 0, column;
     int charsetlen = strlen(charset), utf8;
     char *output = NULL, *p, *q = NULL;
 
@@ -175,6 +175,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
 
     utf8 = strcasecmp(charset, "UTF-8") == 0;
 
+    bool newline = true;
     while (*p != '\0') {
     	/*
 	 * Start a new line, if it's time
@@ -225,7 +226,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
 	    tokenlen = snprintf(q, outlen - (q - output), "=?%s?Q?", charset);
 	    q += tokenlen;
 	    column = prefixlen + tokenlen;
-	    newline = 0;
+	    newline = false;
 	}
 
 	/*
@@ -266,7 +267,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
 	    continue;
 
 	if (column >= ENCODELINELIMIT - 2) {
-	    newline = 1;
+	    newline = true;
 	} else if (utf8) {
 	    /*
 	     * Okay, this is a bit weird, but to explain a bit more ...
@@ -282,7 +283,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
 	     * allow for the encoded output.
 	     */
 	    if (column + (utf8len(p) * 3) > ENCODELINELIMIT - 2) {
-		newline = 1;
+		newline = true;
 	    }
 	}
     }
@@ -551,7 +552,11 @@ field_encode_address(const char *name, char **value, int encoding,
 		     const char *charset)
 {
     int prefixlen = strlen(name) + 2, column = prefixlen, groupflag;
-    int asciichars, specialchars, eightbitchars, reformat = 0, errflag = 0;
+    int asciichars;
+    int specialchars;
+    int eightbitchars;
+    bool reformat = false;
+    bool errflag = false;
     size_t len;
     char *mp, *cp = NULL, *output = NULL;
     char *tmpbuf = NULL;
@@ -576,11 +581,11 @@ field_encode_address(const char *name, char **value, int encoding,
     for (groupflag = 0; (mp = getname(*value)); ) {
     	if ((mn = getm(mp, NULL, 0, errbuf, sizeof(errbuf))) == NULL) {
 	    inform("%s: %s", errbuf, mp);
-	    errflag++;
+	    errflag = true;
 	    continue;
 	}
 
-	reformat = 0;
+	reformat = false;
 
 	/*
 	 * We only care if the phrase (m_pers) or any trailing comment
@@ -619,7 +624,7 @@ field_encode_address(const char *name, char **value, int encoding,
 
 	    case CE_BASE64:
 	    	if (field_encode_base64(NULL, &mn->m_pers, charset)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
@@ -627,18 +632,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    case CE_QUOTED:
 	    	if (field_encode_quoted(NULL, &mn->m_pers, charset, asciichars,
 					eightbitchars + specialchars, 1)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
 
 	    default:
 		inform("Internal error: unknown RFC-2047 encoding type");
-		errflag++;
+		errflag = true;
 		goto out;
 	    }
 
-	    reformat++;
+	    reformat = true;
 	}
 
 	check_note:
@@ -661,7 +666,7 @@ field_encode_address(const char *name, char **value, int encoding,
 	if (mn->m_note[0] != '(' || mn->m_note[len - 1] != ')') {
 	    inform("Internal error: Invalid note field \"%s\"",
 	    	   mn->m_note);
-	    errflag++;
+	    errflag = true;
 	    goto out;
 	}
 
@@ -682,7 +687,7 @@ field_encode_address(const char *name, char **value, int encoding,
 
 	    case CE_BASE64:
 	    	if (field_encode_base64(NULL, &tmpbuf, charset)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
@@ -690,18 +695,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    case CE_QUOTED:
 	    	if (field_encode_quoted(NULL, &tmpbuf, charset, asciichars,
 					eightbitchars + specialchars, 1)) {
-		    errflag++;
+		    errflag = true;
 		    goto out;
 		}
 		break;
 
 	    default:
 		inform("Internal error: unknown RFC-2047 encoding type");
-		errflag++;
+		errflag = true;
 		goto out;
 	    }
 
-	    reformat++;
+	    reformat = true;
 
 	    /*
 	     * Make sure the size of tmpbuf is correct (it always gets
@@ -802,7 +807,7 @@ out:
     free(tmpbuf);
     free(output);
 
-    return errflag > 0;
+    return errflag;
 }
 
 /*