X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/55deb9a8a3f78d67f5882d8e02bbaeab67c9078b..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/fmt_rfc2047.c

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index aa01913b..8c799e14 100644
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -1,6 +1,4 @@
-
-/*
- * fmt_rfc2047.c -- decode RFC-2047 header format 
+/* fmt_rfc2047.c -- decode RFC-2047 header format 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,7 +11,7 @@
 #  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,
@@ -32,7 +30,7 @@ static signed char hexindex[] = {
     -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,
@@ -54,7 +52,7 @@ decode_qp (unsigned char byte1, unsigned char byte2)
 {
     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 */
@@ -128,7 +126,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 	equals_pending = 1;	/* we have a '=' pending */
 
 	/* 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 */
@@ -191,9 +189,9 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 	     */
 	    endofmime = NULL;
 	    for (pp = startofmime; *pp && *(pp+1); pp++) {
-		if (is_lws(*pp)) {
+		if (is_lws(*pp))
 		    break;
-		} else if (*pp == '?' && pp[1] == '=') {
+		if (*pp == '?' && pp[1] == '=') {
 		    endofmime = pp;
 		    break;
 		}
@@ -231,7 +229,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 	    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.