Base64 nits (code quality) fixed.

This also contains the start of some CMakefile refactoring and
clean ups.

1 files changed, 15 insertions, 13 deletions

diff --git a/src/supplemental/base64/base64_test.c b/src/supplemental/base64/base64_test.c
index 2c79a243..44609c3e 100644
--- a/src/supplemental/base64/base64_test.c
+++ b/src/supplemental/base64/base64_test.c
@@ -60,17 +60,17 @@ test_decode(void)
 	void *enc;
 
 	for (i = 0; (enc = cases[i].encoded) != NULL; i++) {
-		char buf[1024];
-		char name[8];
-		int  rv;
+		char   buf[1024];
+		char   name[8];
+		size_t sz;
 
 		(void) snprintf(name, sizeof(name), "%d", i);
 		TEST_CASE(name);
 
-		rv = nni_base64_decode(enc, strlen(enc), (void *) buf, 1024);
-		TEST_CHECK(rv >= 0);
-		TEST_CHECK(rv == (int) strlen(cases[i].decoded));
-		buf[rv] = 0;
+		sz = nni_base64_decode(enc, strlen(enc), (void *) buf, 1024);
+		TEST_CHECK(sz >= 0);
+		TEST_CHECK(sz == strlen(cases[i].decoded));
+		buf[sz] = 0;
 		TEST_CHECK(strcmp(buf, cases[i].decoded) == 0);
 	}
 }
@@ -88,13 +88,15 @@ test_overflow(void)
 		(void) snprintf(name, sizeof(name), "%d", i);
 		TEST_CASE(name);
 
-		TEST_CHECK(nni_base64_encode(
-		               dec, strlen(dec), buf, strlen(enc) - 1) == -1);
-		TEST_CHECK(nni_base64_encode(dec, strlen(dec), buf, 0) == -1);
+		TEST_CHECK(nni_base64_encode(dec, strlen(dec), buf,
+		               strlen(enc) - 1) == (size_t) -1);
+		TEST_CHECK(nni_base64_encode(dec, strlen(dec), buf, 0) ==
+		    (size_t) -1);
 
-		TEST_CHECK(nni_base64_decode(
-		               enc, strlen(enc), buf, strlen(dec) - 1) == -1);
-		TEST_CHECK(nni_base64_encode(enc, strlen(enc), buf, 0) == -1);
+		TEST_CHECK(nni_base64_decode(enc, strlen(enc), buf,
+		               strlen(dec) - 1) == (size_t) -1);
+		TEST_CHECK(nni_base64_encode(enc, strlen(enc), buf, 0) ==
+		    (size_t) -1);
 	}
 }