Change in libosmocore[master]: base64: reformat using Lindent to conform to our coding style

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Tue Sep 21 19:57:56 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25498 )

Change subject: base64: reformat using Lindent to conform to our coding style
......................................................................

base64: reformat using Lindent to conform to our coding style

Change-Id: I2286fa0d2cba7c11359bb48329135dfcd0d8a948
---
M include/osmocom/core/base64.h
M src/base64.c
M tests/base64/base64_test.c
3 files changed, 159 insertions(+), 165 deletions(-)

Approvals:
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/core/base64.h b/include/osmocom/core/base64.h
index f73db0d..86b862e 100644
--- a/include/osmocom/core/base64.h
+++ b/include/osmocom/core/base64.h
@@ -45,8 +45,8 @@
  * \note           Call this function with dlen = 0 to obtain the
  *                 required buffer size in *olen
  */
-int osmo_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen );
+int osmo_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,
+		       const unsigned char *src, size_t slen);
 
 /**
  * \brief          Decode a base64-formatted buffer
@@ -65,8 +65,8 @@
  * \note           Call this function with *dst = NULL or dlen = 0 to obtain
  *                 the required buffer size in *olen
  */
-int osmo_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen );
+int osmo_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,
+		       const unsigned char *src, size_t slen);
 
 #ifdef __cplusplus
 }
diff --git a/src/base64.c b/src/base64.c
index dbc908b..d86573e 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -26,178 +26,174 @@
 #include <stdio.h>
 #include <errno.h>
 
-static const unsigned char base64_enc_map[64] =
-{
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-    'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-    'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
-    'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-    'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
-    'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
-    '8', '9', '+', '/'
+static const unsigned char base64_enc_map[64] = {
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+	'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+	'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+	'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+	'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+	'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+	'8', '9', '+', '/'
 };
 
-static const unsigned char base64_dec_map[128] =
-{
-    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-    127, 127, 127,  62, 127, 127, 127,  63,  52,  53,
-     54,  55,  56,  57,  58,  59,  60,  61, 127, 127,
-    127,  64, 127, 127, 127,   0,   1,   2,   3,   4,
-      5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
-     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
-     25, 127, 127, 127, 127, 127, 127,  26,  27,  28,
-     29,  30,  31,  32,  33,  34,  35,  36,  37,  38,
-     39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
-     49,  50,  51, 127, 127, 127, 127, 127
+static const unsigned char base64_dec_map[128] = {
+	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+	127, 127, 127, 62, 127, 127, 127, 63, 52, 53,
+	54, 55, 56, 57, 58, 59, 60, 61, 127, 127,
+	127, 64, 127, 127, 127, 0, 1, 2, 3, 4,
+	5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+	15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+	25, 127, 127, 127, 127, 127, 127, 26, 27, 28,
+	29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+	39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+	49, 50, 51, 127, 127, 127, 127, 127
 };
 
 /*
  * Encode a buffer into base64 format
  */
-int osmo_base64_encode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen )
+int osmo_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,
+		       const unsigned char *src, size_t slen)
 {
-    size_t i, n;
-    int C1, C2, C3;
-    unsigned char *p;
+	size_t i, n;
+	int C1, C2, C3;
+	unsigned char *p;
 
-    if( slen == 0 )
-    {
-        *olen = 0;
-        return( 0 );
-    }
+	if (slen == 0) {
+		*olen = 0;
+		return 0;
+	}
 
-    n = ( slen << 3 ) / 6;
+	n = (slen << 3) / 6;
 
-    switch( ( slen << 3 ) - ( n * 6 ) )
-    {
-        case  2: n += 3; break;
-        case  4: n += 2; break;
-        default: break;
-    }
+	switch ((slen << 3) - (n * 6)) {
+	case 2:
+		n += 3;
+		break;
+	case 4:
+		n += 2;
+		break;
+	default:
+		break;
+	}
 
-    if( dlen < n + 1 )
-    {
-        *olen = n + 1;
-        return( -ENOBUFS );
-    }
+	if (dlen < n + 1) {
+		*olen = n + 1;
+		return -ENOBUFS;
+	}
 
-    n = ( slen / 3 ) * 3;
+	n = (slen / 3) * 3;
 
-    for( i = 0, p = dst; i < n; i += 3 )
-    {
-        C1 = *src++;
-        C2 = *src++;
-        C3 = *src++;
+	for (i = 0, p = dst; i < n; i += 3) {
+		C1 = *src++;
+		C2 = *src++;
+		C3 = *src++;
 
-        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
-        *p++ = base64_enc_map[(((C1 &  3) << 4) + (C2 >> 4)) & 0x3F];
-        *p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];
-        *p++ = base64_enc_map[C3 & 0x3F];
-    }
+		*p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+		*p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
+		*p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];
+		*p++ = base64_enc_map[C3 & 0x3F];
+	}
 
-    if( i < slen )
-    {
-        C1 = *src++;
-        C2 = ( ( i + 1 ) < slen ) ? *src++ : 0;
+	if (i < slen) {
+		C1 = *src++;
+		C2 = ((i + 1) < slen) ? *src++ : 0;
 
-        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
-        *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
+		*p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+		*p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
 
-        if( ( i + 1 ) < slen )
-             *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
-        else *p++ = '=';
+		if ((i + 1) < slen)
+			*p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
+		else
+			*p++ = '=';
 
-        *p++ = '=';
-    }
+		*p++ = '=';
+	}
 
-    *olen = p - dst;
-    *p = 0;
+	*olen = p - dst;
+	*p = 0;
 
-    return( 0 );
+	return 0;
 }
 
 /*
  * Decode a base64-formatted buffer
  */
-int osmo_base64_decode( unsigned char *dst, size_t dlen, size_t *olen,
-                   const unsigned char *src, size_t slen )
+int osmo_base64_decode(unsigned char *dst, size_t dlen, size_t *olen,
+		       const unsigned char *src, size_t slen)
 {
-    size_t i, n;
-    uint32_t j, x;
-    unsigned char *p;
+	size_t i, n;
+	uint32_t j, x;
+	unsigned char *p;
 
-    /* First pass: check for validity and get output length */
-    for( i = n = j = 0; i < slen; i++ )
-    {
-        /* Skip spaces before checking for EOL */
-        x = 0;
-        while( i < slen && src[i] == ' ' )
-        {
-            ++i;
-            ++x;
-        }
+	/* First pass: check for validity and get output length */
+	for (i = n = j = 0; i < slen; i++) {
+		/* Skip spaces before checking for EOL */
+		x = 0;
+		while (i < slen && src[i] == ' ') {
+			++i;
+			++x;
+		}
 
-        /* Spaces at end of buffer are OK */
-        if( i == slen )
-            break;
+		/* Spaces at end of buffer are OK */
+		if (i == slen)
+			break;
 
-        if( ( slen - i ) >= 2 &&
-            src[i] == '\r' && src[i + 1] == '\n' )
-            continue;
+		if ((slen - i) >= 2 && src[i] == '\r' && src[i + 1] == '\n')
+			continue;
 
-        if( src[i] == '\n' )
-            continue;
+		if (src[i] == '\n')
+			continue;
 
-        /* Space inside a line is an error */
-        if( x != 0 )
-            return( -EINVAL );
+		/* Space inside a line is an error */
+		if (x != 0)
+			return -EINVAL;
 
-        if( src[i] == '=' && ++j > 2 )
-            return( -EINVAL );
+		if (src[i] == '=' && ++j > 2)
+			return -EINVAL;
 
-        if( src[i] > 127 || base64_dec_map[src[i]] == 127 )
-            return( -EINVAL );
+		if (src[i] > 127 || base64_dec_map[src[i]] == 127)
+			return -EINVAL;
 
-        if( base64_dec_map[src[i]] < 64 && j != 0 )
-            return( -EINVAL );
+		if (base64_dec_map[src[i]] < 64 && j != 0)
+			return -EINVAL;
 
-        n++;
-    }
+		n++;
+	}
 
-    if( n == 0 )
-        return( 0 );
+	if (n == 0)
+		return 0;
 
-    n = ( ( n * 6 ) + 7 ) >> 3;
-    n -= j;
+	n = ((n * 6) + 7) >> 3;
+	n -= j;
 
-    if( dst == NULL || dlen < n )
-    {
-        *olen = n;
-        return( -ENOBUFS );
-    }
+	if (dst == NULL || dlen < n) {
+		*olen = n;
+		return -ENOBUFS;
+	}
 
-   for( j = 3, n = x = 0, p = dst; i > 0; i--, src++ )
-   {
-        if( *src == '\r' || *src == '\n' || *src == ' ' )
-            continue;
+	for (j = 3, n = x = 0, p = dst; i > 0; i--, src++) {
+		if (*src == '\r' || *src == '\n' || *src == ' ')
+			continue;
 
-        j -= ( base64_dec_map[*src] == 64 );
-        x  = ( x << 6 ) | ( base64_dec_map[*src] & 0x3F );
+		j -= (base64_dec_map[*src] == 64);
+		x = (x << 6) | (base64_dec_map[*src] & 0x3F);
 
-        if( ++n == 4 )
-        {
-            n = 0;
-            if( j > 0 ) *p++ = (unsigned char)( x >> 16 );
-            if( j > 1 ) *p++ = (unsigned char)( x >>  8 );
-            if( j > 2 ) *p++ = (unsigned char)( x       );
-        }
-    }
+		if (++n == 4) {
+			n = 0;
+			if (j > 0)
+				*p++ = (unsigned char)(x >> 16);
+			if (j > 1)
+				*p++ = (unsigned char)(x >> 8);
+			if (j > 2)
+				*p++ = (unsigned char)(x);
+		}
+	}
 
-    *olen = p - dst;
+	*olen = p - dst;
 
-    return( 0 );
+	return 0;
 }
diff --git a/tests/base64/base64_test.c b/tests/base64/base64_test.c
index e85f649..79ec212 100644
--- a/tests/base64/base64_test.c
+++ b/tests/base64/base64_test.c
@@ -1,17 +1,17 @@
 #include <osmocom/core/base64.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
-static const unsigned char base64_test_dec[64] =
-{
-    0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD,
-    0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,
-    0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09,
-    0x0C, 0xB6, 0xE9, 0x10, 0x6F, 0x22, 0xEE, 0x13,
-    0xCA, 0xB3, 0x07, 0x05, 0x76, 0xC9, 0xFA, 0x31,
-    0x6C, 0x08, 0x34, 0xFF, 0x8D, 0xC2, 0x6C, 0x38,
-    0x00, 0x43, 0xE9, 0x54, 0x97, 0xAF, 0x50, 0x4B,
-    0xD1, 0x41, 0xBA, 0x95, 0x31, 0x5A, 0x0B, 0x97
+static const unsigned char base64_test_dec[64] = {
+	0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD,
+	0xBF, 0x17, 0xD9, 0xA2, 0xC4, 0x17, 0x1A, 0x01,
+	0x94, 0xED, 0x8F, 0x1E, 0x11, 0xB3, 0xD7, 0x09,
+	0x0C, 0xB6, 0xE9, 0x10, 0x6F, 0x22, 0xEE, 0x13,
+	0xCA, 0xB3, 0x07, 0x05, 0x76, 0xC9, 0xFA, 0x31,
+	0x6C, 0x08, 0x34, 0xFF, 0x8D, 0xC2, 0x6C, 0x38,
+	0x00, 0x43, 0xE9, 0x54, 0x97, 0xAF, 0x50, 0x4B,
+	0xD1, 0x41, 0xBA, 0x95, 0x31, 0x5A, 0x0B, 0x97
 };
 
 static const unsigned char base64_test_enc[] =
@@ -23,35 +23,33 @@
  */
 int main(int argc, char **argv)
 {
-    size_t len;
-    const unsigned char *src;
-    unsigned char buffer[128];
+	size_t len;
+	const unsigned char *src;
+	unsigned char buffer[128];
 
-    printf( "  Base64 encoding test: " );
+	printf("  Base64 encoding test: ");
 
-    src = base64_test_dec;
+	src = base64_test_dec;
 
-    if( osmo_base64_encode( buffer, sizeof( buffer ), &len, src, 64 ) != 0 ||
-         memcmp( base64_test_enc, buffer, 88 ) != 0 )
-    {
-        printf( "failed\n" );
+	if (osmo_base64_encode(buffer, sizeof(buffer), &len, src, 64) != 0 ||
+	    memcmp(base64_test_enc, buffer, 88) != 0) {
+		printf("failed\n");
 
-        return( 1 );
-    }
+		exit(1);
+	}
 
-    printf( "passed\n  Base64 decoding test: " );
+	printf("passed\n  Base64 decoding test: ");
 
-    src = base64_test_enc;
+	src = base64_test_enc;
 
-    if( osmo_base64_decode( buffer, sizeof( buffer ), &len, src, 88 ) != 0 ||
-         memcmp( base64_test_dec, buffer, 64 ) != 0 )
-    {
-        printf( "failed\n" );
+	if (osmo_base64_decode(buffer, sizeof(buffer), &len, src, 88) != 0 ||
+	    memcmp(base64_test_dec, buffer, 64) != 0) {
+		printf("failed\n");
 
-        return( 1 );
-    }
+		exit(1);
+	}
 
-    printf( "passed\n\n" );
+	printf("passed\n\n");
 
-    return( 0 );
+	exit(0);
 }

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25498
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2286fa0d2cba7c11359bb48329135dfcd0d8a948
Gerrit-Change-Number: 25498
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210921/85db3124/attachment.htm>


More information about the gerrit-log mailing list