Rename recently added HasSuffixC() to has_suffix_c().

[nmh] / sbr / base64.c

diff --git a/sbr/base64.c b/sbr/base64.c
index 6a30e2f0ca7e2ff5ec7c2e0cb48575657e9121e7..a1e54c92fc0cf6371e6fbc0f06e54ff792a86888 100644 (file)
--- a/sbr/base64.c
+++ b/sbr/base64.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <inttypes.h>
 
 #include <h/md5.h>
 #include <inttypes.h>
 

-static char nib2b64[0x40+1] =
+static const char nib2b64[0x40+1] =

        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 int
        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 int


@@ -209,7 +209,7 @@ writeBase64raw (const unsigned char *in, size_t length, unsigned char *out)
 }
 
 
 }
 
 

-static unsigned char b642nib[0x80] = {
+static const unsigned char b642nib[0x80] = {

     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,


@@ -243,7 +243,8 @@ decodeBase64 (const char *encoded, unsigned char **decoded, size_t *len,
     charstring_t decoded_c = charstring_create (strlen (encoded));
     MD5_CTX mdContext;
 
     charstring_t decoded_c = charstring_create (strlen (encoded));
     MD5_CTX mdContext;
 

-    if (digest) { MD5Init (&mdContext); }
+    if (digest)
+        MD5Init (&mdContext);

 
     bitno = 18;
     bits = 0L;
 
     bitno = 18;
     bits = 0L;


@@ -274,19 +275,22 @@ test_end:
                     if (! skip_crs  ||  b != '\r') {
                         charstring_push_back (decoded_c, b);
                     }
                     if (! skip_crs  ||  b != '\r') {
                         charstring_push_back (decoded_c, b);
                     }

-                    if (digest) { MD5Update (&mdContext, (unsigned char *) &b, 1); }
+                    if (digest)
+                        MD5Update (&mdContext, (unsigned char *) &b, 1);

                     if (skip < 2) {
                         b = (bits >> 8) & 0xff;
                         if (! skip_crs  ||  b != '\r') {
                             charstring_push_back (decoded_c, b);
                         }
                     if (skip < 2) {
                         b = (bits >> 8) & 0xff;
                         if (! skip_crs  ||  b != '\r') {
                             charstring_push_back (decoded_c, b);
                         }

-                        if (digest) { MD5Update (&mdContext, (unsigned char *) &b, 1); }
+                        if (digest)
+                            MD5Update (&mdContext, (unsigned char *) &b, 1);

                         if (skip < 1) {
                             b = bits & 0xff;
                             if (! skip_crs  ||  b != '\r') {
                                 charstring_push_back (decoded_c, b);
                             }
                         if (skip < 1) {
                             b = bits & 0xff;
                             if (! skip_crs  ||  b != '\r') {
                                 charstring_push_back (decoded_c, b);
                             }

-                            if (digest) { MD5Update (&mdContext, (unsigned char *) &b, 1); }
+                            if (digest)
+                                MD5Update (&mdContext, (unsigned char *) &b, 1);

                         }
                     }
 
                         }
                     }