From d01120230288d6a3e64f664554a1963296834a05 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sun, 24 Nov 2019 23:17:19 -0800
Subject: [PATCH 01/18] safestringlib: no static build and no relro

Do not build the test program as static. Static programs are not
supported on some modern distros. relro is also rejected, so
drop it.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index f7cc268..8a417c6 100644
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@ IDIR = include
 MKDIR_P = mkdir -p
 CC=gcc
 CFLAGS=-I$(IDIR) -fstack-protector-strong -fPIE -fPIC -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-LDFLAGS=-z noexecstack -z relo -z now
+LDFLAGS=-z noexecstack -z now
 
 ODIR=obj
 OTDIR=objtest
@@ -48,7 +48,7 @@ $(OTDIR)/%.o: $(TESTDIR)/%.c $(TESTDIR)/test_private.h
 
 
 safestringtest: directories libsafestring.a $(TOBJ)
-	$(CC) $(LDFLAGS) -static -o $@ $(TOBJ) libsafestring.a
+	$(CC) $(LDFLAGS) -o $@ $(TOBJ) libsafestring.a
 
 
 .PHONY: directories

From eea1afe912f2e9dd1daa79d387e8c960f5ad6c69 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sun, 24 Nov 2019 20:27:42 -0800
Subject: [PATCH 02/18] safestringlib: Resolve gcc9 null string warnings

Gcc9 complains about passing null string pointers, so resolve
the obvious cases that the compiler reports by passing ""
instead of the null pointer.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 unittests/test_strtok_s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unittests/test_strtok_s.c b/unittests/test_strtok_s.c
index 8cba76f..e1fbf4b 100644
--- a/unittests/test_strtok_s.c
+++ b/unittests/test_strtok_s.c
@@ -114,7 +114,7 @@ int test_strtok_s()
     p2tok = strtok_s(str1, &len, str2, &p2str);
     if (p2tok == NULL) {
         printf("%s %u token -%s-  remaining -%s-  \n",
-                     __FUNCTION__, __LINE__,  p2tok, p2str);
+                     __FUNCTION__, __LINE__,  "", p2str);
     }
 
 /*--------------------------------------------------*/
@@ -129,7 +129,7 @@ int test_strtok_s()
     p2tok = strtok_s(str1, &len, str2, &p2str);
     if (p2tok == NULL) {
         printf("%s %u token -%s-  remaining -%s-  \n",
-                     __FUNCTION__, __LINE__,  p2tok, p2str);
+                     __FUNCTION__, __LINE__,  "", p2str);
     }
 
     if (strcmp(p2tok, "mnopqrst")) {

From ea8c58e9671167884c87d1785a003da077f89ee9 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sun, 6 May 2018 21:46:21 -0700
Subject: [PATCH 03/18] safestring: Always print test failures

Many test failures only print when DEBUG is defined. This is crazy.
Always print test failures. Also count test failures and return the
failures count instead of uselessly returning 0 from each test
routine. That allows the test to stop and clearly report the presence
of errors.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 unittests/Safe_String_UnitTestMain.c | 163 ++++++++++++++------------
 unittests/test_memcmp16_s.c          | 101 +++++++++-------
 unittests/test_memcmp32_s.c          |  95 +++++++++------
 unittests/test_memcmp_s.c            | 113 +++++++++++-------
 unittests/test_memcpy16_s.c          |  88 +++++++++-----
 unittests/test_memcpy32_s.c          |  88 +++++++++-----
 unittests/test_memcpy_s.c            | 100 ++++++++++------
 unittests/test_memmove16_s.c         |  65 ++++++-----
 unittests/test_memmove32_s.c         |  76 +++++++-----
 unittests/test_memmove_s.c           |  74 +++++++-----
 unittests/test_memset16_s.c          |  45 ++++---
 unittests/test_memset32_s.c          |  45 ++++---
 unittests/test_memset_s.c            |  43 ++++---
 unittests/test_memzero16_s.c         |  44 ++++---
 unittests/test_memzero32_s.c         |  44 ++++---
 unittests/test_memzero_s.c           |  44 ++++---
 unittests/test_stpcpy_s.c            |  50 +++++++-
 unittests/test_stpncpy_s.c           |  64 +++++++++-
 unittests/test_strcasecmp_s.c        |  32 ++++-
 unittests/test_strcasestr_s.c        |  52 ++++++++-
 unittests/test_strcat_s.c            | 168 ++++++++++++++++-----------
 unittests/test_strcmp_s.c            |  32 ++++-
 unittests/test_strcmpfld_s.c         | 110 +++++++++++-------
 unittests/test_strcpy_s.c            | 138 +++++++++++++---------
 unittests/test_strcpyfld_s.c         |  90 ++++++++------
 unittests/test_strcpyfldin_s.c       | 120 +++++++++++--------
 unittests/test_strcpyfldout_s.c      | 118 +++++++++++--------
 unittests/test_strcspn_s.c           |  35 +++++-
 unittests/test_strfirstchar_s.c      |  22 +++-
 unittests/test_strfirstdiff_s.c      |  32 ++++-
 unittests/test_strfirstsame_s.c      |  34 +++++-
 unittests/test_strisalphanumeric_s.c |  16 ++-
 unittests/test_strisascii_s.c        |  15 ++-
 unittests/test_strisdigit_s.c        |  14 ++-
 unittests/test_strishex_s.c          |  16 ++-
 unittests/test_strislowercase_s.c    |  13 ++-
 unittests/test_strismixed_s.c        |  14 ++-
 unittests/test_strispassword_s.c     |  16 ++-
 unittests/test_strisuppercase_s.c    |  14 ++-
 unittests/test_strlastchar_s.c       |  24 +++-
 unittests/test_strlastdiff_s.c       |  28 ++++-
 unittests/test_strlastsame_s.c       |  34 +++++-
 unittests/test_strljustify_s.c       |  29 ++++-
 unittests/test_strncat_s.c           | 118 +++++++++++--------
 unittests/test_strncpy_s.c           | 168 ++++++++++++++++-----------
 unittests/test_strnlen_s.c           |  13 ++-
 unittests/test_strnterminate_s.c     |  19 ++-
 unittests/test_strpbrk_s.c           |  36 +++++-
 unittests/test_strprefix_s.c         |  18 ++-
 unittests/test_strremovews_s.c       |  28 ++++-
 unittests/test_strspn_s.c            |  36 +++++-
 unittests/test_strstr_s.c            |  39 ++++++-
 unittests/test_strtok_s.c            |  19 ++-
 unittests/test_strtolowercase_s.c    |  19 ++-
 unittests/test_strtouppercase_s.c    |  18 ++-
 unittests/test_wcpcpy_s.c            |  54 ++++++++-
 unittests/test_wcscat_s.c            |  40 ++++++-
 unittests/test_wcscpy_s.c            |  37 +++++-
 unittests/test_wcsncat_s.c           |  44 ++++++-
 unittests/test_wcsncpy_s.c           |  49 +++++++-
 unittests/test_wcsnlen_s.c           |  10 +-
 unittests/test_wmemcmp_s.c           |  33 +++++-
 unittests/test_wmemcpy_s.c           |  39 ++++++-
 unittests/test_wmemmove_s.c          |  43 ++++++-
 unittests/test_wmemset_s.c           |  19 ++-
 65 files changed, 2503 insertions(+), 954 deletions(-)

diff --git a/unittests/Safe_String_UnitTestMain.c b/unittests/Safe_String_UnitTestMain.c
index fa40511..04fceae 100644
--- a/unittests/Safe_String_UnitTestMain.c
+++ b/unittests/Safe_String_UnitTestMain.c
@@ -79,6 +79,8 @@ extern int test_wmemmove_s(void);
 extern int test_wmemset_s(void);
 extern int test_wmemcmp_s(void);
 
+#define TEST_FUNC(f) { #f, f }
+
 int main(void) {
 
 	char     dest[128];
@@ -86,82 +88,90 @@ int main(void) {
 	rsize_t  dmax = 128;
 	rsize_t  smax = 21;
 	errno_t err;
+	static const struct {
+		const char * const name;
+		int (*func)(void);
+	} funcs[] = {
+		TEST_FUNC(test_memcmp_s),
+		TEST_FUNC(test_memcmp16_s),
+		TEST_FUNC(test_memcmp32_s),
+		TEST_FUNC(test_memcpy_s),
+		TEST_FUNC(test_memcpy16_s),
+		TEST_FUNC(test_memcpy32_s),
+		TEST_FUNC(test_memmove_s),
+		TEST_FUNC(test_memmove16_s),
+		TEST_FUNC(test_memmove32_s),
+		TEST_FUNC(test_memset_s),
+		TEST_FUNC(test_memset16_s),
+		TEST_FUNC(test_memset32_s),
+		TEST_FUNC(test_memzero_s),
+		TEST_FUNC(test_memzero16_s),
+		TEST_FUNC(test_memzero32_s),
+		TEST_FUNC(test_stpcpy_s),
+		TEST_FUNC(test_stpncpy_s),
+		TEST_FUNC(test_strcasecmp_s),
+		TEST_FUNC(test_strcasestr_s),
+		TEST_FUNC(test_strcat_s),
+		TEST_FUNC(test_strcmp_s),
+		TEST_FUNC(test_strcmpfld_s),
+		TEST_FUNC(test_strcpy_s),
+		TEST_FUNC(test_strcpyfld_s),
+		TEST_FUNC(test_strcpyfldin_s),
+		TEST_FUNC(test_strcpyfldout_s),
+		TEST_FUNC(test_strcspn_s),
+		TEST_FUNC(test_strfirstchar_s),
+		TEST_FUNC(test_strfirstdiff_s),
+		TEST_FUNC(test_strfirstsame_s),
+		TEST_FUNC(test_strisalphanumeric_s),
+		TEST_FUNC(test_strisascii_s),
+		TEST_FUNC(test_strisdigit_s),
+		TEST_FUNC(test_strishex_s),
+		TEST_FUNC(test_strislowercase_s),
+		TEST_FUNC(test_strismixed_s),
+		TEST_FUNC(test_strispassword_s),
+		TEST_FUNC(test_strisuppercase_s),
+		TEST_FUNC(test_strlastchar_s),
+		TEST_FUNC(test_strlastdiff_s),
+		TEST_FUNC(test_strlastsame_s),
+		TEST_FUNC(test_strljustify_s),
+		TEST_FUNC(test_strncat_s),
+		TEST_FUNC(test_strncpy_s),
+		TEST_FUNC(test_strnlen_s),
+		TEST_FUNC(test_strnterminate_s),
+		TEST_FUNC(test_strpbrk_s),
+		TEST_FUNC(test_strprefix_s),
+		TEST_FUNC(test_strremovews_s),
+		TEST_FUNC(test_strspn_s),
+		TEST_FUNC(test_strstr_s),
+		TEST_FUNC(test_strtok_s),
+		TEST_FUNC(test_strtolowercase_s),
+		TEST_FUNC(test_strtouppercase_s),
+		TEST_FUNC(test_strzero_s),
+		TEST_FUNC(test_wcpcpy_s),
+		TEST_FUNC(test_wcscat_s),
+		TEST_FUNC(test_wcscpy_s),
+		TEST_FUNC(test_wcsncat_s),
+		TEST_FUNC(test_wcsncpy_s),
+		TEST_FUNC(test_wcsnlen_s),
+		TEST_FUNC(test_wmemcpy_s),
+		TEST_FUNC(test_wmemmove_s),
+		TEST_FUNC(test_wmemset_s),
+		TEST_FUNC(test_wmemcmp_s),
+	};
+	unsigned int i;
+	int errs;
 
 	puts("!!!Basic Test Suite for Safe String Operations!!!");
 	puts("       ERRORS PRINT TO CONSOLE");
     puts("----------------BEGIN TEST--------------------");
-	test_memcmp_s();
-	test_memcmp16_s();
-	test_memcmp32_s();
-	test_memcpy_s();
-	test_memcpy16_s();
-	test_memcpy32_s();
-	test_memmove_s();
-	test_memmove16_s();
-	test_memmove32_s();
-	test_memset_s();
-	test_memset16_s();
-	test_memset32_s();
-	test_memzero_s();
-	test_memzero16_s();
-	test_memzero32_s();
-
-
-	test_stpcpy_s(); /* New - Done */
-	test_stpncpy_s(); /* New - Done */
-
-	test_strcasecmp_s();
-	test_strcasestr_s();
-	test_strcat_s();
-	test_strcmp_s();
-	test_strcmpfld_s();
-	test_strcpy_s();
-	test_strcpyfld_s();
-	test_strcpyfldin_s();
-	test_strcpyfldout_s();
-	test_strcspn_s ();
-
-	test_strfirstchar_s();
-	test_strfirstdiff_s();
-	test_strfirstsame_s();
-	test_strisalphanumeric_s();
-	test_strisascii_s();
-	test_strisdigit_s();
-	test_strishex_s();
-	test_strislowercase_s();
-	test_strismixed_s();
-	test_strispassword_s();
-	test_strisuppercase_s();
-
-	test_strlastchar_s();
-	test_strlastdiff_s();
-	test_strlastsame_s();
-	test_strljustify_s();
-
-	test_strncat_s ();
-	test_strncpy_s ();
-	test_strnlen_s ();
-	test_strnterminate_s();
-	test_strpbrk_s ();
-	test_strprefix_s();
-	test_strremovews_s();
-	test_strspn_s ();
-	test_strstr_s ();
-	test_strtok_s();
-	test_strtolowercase_s();
-	test_strtouppercase_s();
-	test_strzero_s();
-
-	test_wcpcpy_s(); /* New - Done */
-	test_wcscat_s(); /* New - Done */
-	test_wcscpy_s(); /* New - Done */
-	test_wcsncat_s(); /* New - Done */
-	test_wcsncpy_s(); /* New - Done */
-	test_wcsnlen_s(); /* New - Done */
-	test_wmemcpy_s(); /* New - Done */
-	test_wmemmove_s(); /* New - Done */
-	test_wmemset_s(); /* New - Done */
-	test_wmemcmp_s(); /* New - Done */
+	for (i = 0; i < sizeof(funcs) / sizeof(funcs[0]); ++i) {
+		printf("test %d = %s\n", i, funcs[i].name);
+		errs = funcs[i].func();
+		if (errs) {
+			printf("%d error(s) found, test halted\n", errs);
+			return 1;
+		}
+	}
 
 	char   str[] = "This is a char array";
 	char   str2[] = "...And another one.";
@@ -171,20 +181,29 @@ int main(void) {
     char *ret = stpcpy_s(&dest[20], 108, str2, &err);
     if (err != EOK) {
 		puts("stpcpy_s returned failure");
+		++errs;
 	}
 
     int val = 55;
     if ( (err = snprintf_s_si(src, 128, "Test sprintf_s_si() with simple format string [%s] and %d", dest, val)) < 0 ) {
     	if ( SNPRFNEGATE(ESBADFMT) == err ) {
     		puts("snprintf_s_si returned failure: Error Bad Format String.");
+		++errs;
     	} else if ( SNPRFNEGATE(ESFMTTYP) == err ) {
     		puts("snprintf_s_si returned failure: Error Bad Argument Type for format string.");
+		++errs;
     	} else {
     		printf("snprintf_s_si failed with unknown error: %d\n", err);
+		++errs;
     	}
     } else if ((strcmp_s(src, smax, "Test sprintf_s_si() with simple format string [This is a char array...And another one.] and 55", &indicator) != EOK ) || (indicator != 0 )) {
     	puts("snprintf_s_si() failed - output was:");
     	puts(src);
+    	++errs;
+    }
+    if (errs) {
+    	printf("%d error(s) found, test halted\n", errs);
+	return 1;
     }
     puts("----------------END TEST--------------------");
 	return EXIT_SUCCESS;
diff --git a/unittests/test_memcmp16_s.c b/unittests/test_memcmp16_s.c
index d4ed057..81b9f83 100644
--- a/unittests/test_memcmp16_s.c
+++ b/unittests/test_memcmp16_s.c
@@ -9,10 +9,10 @@
 
 #define LEN   ( 128 )
 
-int test_memcmp16_s()
+int test_memcmp16_s(void)
 {
     errno_t rc;
-
+    int errs = 0;
     uint32_t len;
     int32_t  ind;
     int32_t  std_ind;
@@ -25,56 +25,63 @@ int test_memcmp16_s()
 
     rc = memcmp16_s(NULL, LEN, mem2, LEN, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp16_s(mem1, LEN, NULL, LEN, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp16_s(mem1, LEN, mem2, LEN, NULL);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp16_s(mem1, 0, mem2, LEN, &ind);
     if (rc != ESZEROL) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp16_s(mem1, LEN, mem2, 0, &ind);
     if (rc != ESZEROL) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp16_s(mem1, RSIZE_MAX_MEM+1, mem2, LEN, &ind);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp16_s(mem1, LEN, mem2, RSIZE_MAX_MEM+1, &ind);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -85,19 +92,22 @@ int test_memcmp16_s()
     len = 1;
     rc = memcmp16_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, len*2);
     if (ind != std_ind) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -108,19 +118,22 @@ int test_memcmp16_s()
     len = 2;
     rc = memcmp16_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, len*2);
     if (ind != std_ind) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -130,19 +143,22 @@ int test_memcmp16_s()
 
     rc = memcmp16_s(mem1, LEN, mem2, LEN, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, LEN*2);
     if (ind != std_ind) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -154,23 +170,26 @@ int test_memcmp16_s()
 
     rc = memcmp16_s(mem1, LEN, mem2, LEN, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind == 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, LEN*2);
     if (ind != std_ind) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memcmp32_s.c b/unittests/test_memcmp32_s.c
index 4913e31..c6bdb20 100644
--- a/unittests/test_memcmp32_s.c
+++ b/unittests/test_memcmp32_s.c
@@ -9,9 +9,10 @@
 
 #define LEN   ( 128 )
 
-int test_memcmp32_s()
+int test_memcmp32_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
     int32_t  ind;
     int32_t  std_ind;
@@ -24,56 +25,63 @@ int test_memcmp32_s()
 
     rc = memcmp32_s(NULL, LEN, mem2, LEN, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp32_s(mem1, LEN, NULL, LEN, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp32_s(mem1, LEN, mem2, LEN, NULL);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp32_s(mem1, 0, mem2, LEN, &ind);
     if (rc != ESZEROL) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp32_s(mem1, LEN, mem2, 0, &ind);
     if (rc != ESZEROL) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp32_s(mem1, RSIZE_MAX_MEM+1, mem2, LEN, &ind);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp32_s(mem1, LEN, mem2, RSIZE_MAX_MEM+1, &ind);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,19 +92,22 @@ int test_memcmp32_s()
     len = 1;
     rc = memcmp32_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, len*4);
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -107,19 +118,22 @@ int test_memcmp32_s()
     len = 2;
     rc = memcmp32_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, len*4);
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -129,19 +143,22 @@ int test_memcmp32_s()
 
     rc = memcmp32_s(mem1, LEN, mem2, LEN, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     ind = memcmp(mem1, mem2, LEN*4);
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -153,17 +170,19 @@ int test_memcmp32_s()
 
     rc = memcmp32_s(mem1, LEN, mem2, LEN, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc );
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind == 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc );
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memcmp_s.c b/unittests/test_memcmp_s.c
index fb9bdb5..65e4505 100644
--- a/unittests/test_memcmp_s.c
+++ b/unittests/test_memcmp_s.c
@@ -16,6 +16,7 @@ static uint8_t  mem2[LEN];
 int test_memcmp_s (void)
 {
     errno_t rc;
+    int errs = 0;
     int32_t  ind;
     int32_t  std_ind;
     uint32_t len;
@@ -24,56 +25,63 @@ int test_memcmp_s (void)
 
     rc = memcmp_s(NULL, LEN, mem2, LEN, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp_s(mem1, LEN, NULL, LEN, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp_s(mem1, LEN, mem2, LEN, NULL);
     if (rc != ESNULLP) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp_s(mem1, 0, mem2, LEN, &ind);
     if (rc != ESZEROL) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp_s(mem1, LEN, mem2, 0, &ind);
     if (rc != ESZEROL) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp_s(mem1, LEN, mem2, RSIZE_MAX_MEM+1, &ind);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcmp_s(mem1, RSIZE_MAX_MEM+1, mem2, LEN, &ind);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -85,19 +93,22 @@ int test_memcmp_s (void)
 
     rc = memcmp_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, len);
     if (ind != std_ind) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -109,19 +120,22 @@ int test_memcmp_s (void)
 
     rc = memcmp_s(&mem1[1], len, &mem2[1], len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, len);
     if (ind != std_ind) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -133,19 +147,22 @@ int test_memcmp_s (void)
 
     rc = memcmp_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = memcmp(mem1, mem2, len);
     if (ind != std_ind) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -158,13 +175,15 @@ int test_memcmp_s (void)
 
     rc = memcmp_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind < 1) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -177,13 +196,15 @@ int test_memcmp_s (void)
 
     rc = memcmp_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind > -1) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -195,17 +216,19 @@ int test_memcmp_s (void)
 
     rc = memcmp_s(mem1, len, mem2, len, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u  Ind=%d  Error rc=%u \n",
-                     __FUNCTION__, __LINE__, ind, rc);
+        printf("%s %u  Ind=%d  Error rc=%u \n",
+               __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
-        debug_printf("%s %u  Ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__,  ind, rc);
+        printf("%s %u  Ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_memcpy16_s.c b/unittests/test_memcpy16_s.c
index 0e5da19..24283a2 100644
--- a/unittests/test_memcpy16_s.c
+++ b/unittests/test_memcpy16_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 1024 )
 
 
-int test_memcpy16_s()
+int test_memcpy16_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
     uint32_t i;
 
@@ -24,48 +25,54 @@ int test_memcpy16_s()
 
     rc = memcpy16_s(NULL, LEN, mem2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy16_s(mem1, 0, mem2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy16_s(mem1, RSIZE_MAX_MEM16+1, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy16_s(mem1, LEN, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy16_s(mem1, 10, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy16_s(mem1, LEN, mem2, RSIZE_MAX_MEM16+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -76,14 +83,16 @@ int test_memcpy16_s()
     len = 1;
     rc = memcpy16_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -95,14 +104,16 @@ int test_memcpy16_s()
     len = 2;
     rc = memcpy16_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -114,8 +125,9 @@ int test_memcpy16_s()
     /* slen greater than dmax */
     rc = memcpy16_s(mem1, LEN/2, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -123,6 +135,7 @@ int test_memcpy16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -133,8 +146,9 @@ int test_memcpy16_s()
 
     rc = memcpy16_s(mem1, LEN, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -142,6 +156,7 @@ int test_memcpy16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -152,8 +167,9 @@ int test_memcpy16_s()
 
     rc = memcpy16_s(mem1, LEN, mem2, RSIZE_MAX_MEM16+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -161,6 +177,7 @@ int test_memcpy16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -172,8 +189,9 @@ int test_memcpy16_s()
     /* same ptr - no move */
     rc = memcpy16_s(mem1, LEN, mem1, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -184,8 +202,9 @@ int test_memcpy16_s()
     /* overlap */
     rc = memcpy16_s(&mem1[0], 100, &mem1[10], 100);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -193,6 +212,7 @@ int test_memcpy16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -204,8 +224,9 @@ int test_memcpy16_s()
     /* overlap error */
     rc = memcpy16_s(&mem1[10], 100, &mem1[0], 100);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -213,6 +234,7 @@ int test_memcpy16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -223,19 +245,21 @@ int test_memcpy16_s()
 
     rc = memcpy16_s(mem1, LEN, mem2, LEN/2);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=10; i<LEN/2; i++) {
         if (mem1[i] != 44) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memcpy32_s.c b/unittests/test_memcpy32_s.c
index 4be3d95..7f05e76 100644
--- a/unittests/test_memcpy32_s.c
+++ b/unittests/test_memcpy32_s.c
@@ -10,9 +10,10 @@
 
 #define LEN   ( 1024 )
 
-int test_memcpy32_s()
+int test_memcpy32_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
     uint32_t i;
 
@@ -23,48 +24,54 @@ int test_memcpy32_s()
 
     rc = memcpy32_s(NULL, LEN, mem2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy32_s(mem1, 0, mem2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy32_s(mem1, RSIZE_MAX_MEM32+1, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy32_s(mem1, LEN, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy32_s(mem1, 10, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy32_s(mem1, LEN, mem2, RSIZE_MAX_MEM32+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -75,14 +82,16 @@ int test_memcpy32_s()
     len = 1;
     rc = memcpy32_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -94,14 +103,16 @@ int test_memcpy32_s()
     len = 2;
     rc = memcpy32_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -113,8 +124,9 @@ int test_memcpy32_s()
     /* slen greater than dmax */
     rc = memcpy32_s(mem1, LEN/2, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -122,6 +134,7 @@ int test_memcpy32_s()
         if (mem1[i] != 0 ) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -132,8 +145,9 @@ int test_memcpy32_s()
 
     rc = memcpy32_s(mem1, LEN, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -141,6 +155,7 @@ int test_memcpy32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -151,8 +166,9 @@ int test_memcpy32_s()
 
     rc = memcpy32_s(mem1, LEN, mem2, RSIZE_MAX_MEM32+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -160,6 +176,7 @@ int test_memcpy32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -171,8 +188,9 @@ int test_memcpy32_s()
     /* same ptr */
     rc = memcpy32_s(mem1, LEN, mem1, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -183,8 +201,9 @@ int test_memcpy32_s()
     /* overlap */
     rc = memcpy32_s(&mem1[0], 100, &mem1[10], 100);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -192,6 +211,7 @@ int test_memcpy32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -203,8 +223,9 @@ int test_memcpy32_s()
     /* overlap */
     rc = memcpy32_s(&mem1[10], 100, &mem1[0], 100);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -212,6 +233,7 @@ int test_memcpy32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -222,19 +244,21 @@ int test_memcpy32_s()
 
     rc = memcpy32_s(mem1, LEN, mem2, LEN/2);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<LEN/2; i++) {
         if (mem1[i] != 75) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memcpy_s.c b/unittests/test_memcpy_s.c
index f6649b5..b993711 100644
--- a/unittests/test_memcpy_s.c
+++ b/unittests/test_memcpy_s.c
@@ -16,6 +16,7 @@ static uint8_t  mem2[LEN+2];
 int test_memcpy_s (void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     rsize_t len;
 
@@ -23,48 +24,54 @@ int test_memcpy_s (void)
 
     rc = memcpy_s(NULL, LEN, mem2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy_s(mem1, 0, mem2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy_s(mem1, RSIZE_MAX_MEM+1, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy_s(mem1, LEN, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy_s(mem1, 10, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memcpy_s(mem1, LEN, mem2, RSIZE_MAX_MEM+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -75,20 +82,23 @@ int test_memcpy_s (void)
     len = LEN;
     rc = memcpy_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[i] != 33) {
         printf("%d - %zu m1=%d  m2=%d  \n",
                  __LINE__, len, mem1[len], mem2[len]);
+        ++errs;
     }
 
     }
@@ -101,21 +111,23 @@ int test_memcpy_s (void)
     len = LEN;
     rc = memcpy_s(mem1, len, mem2, (len+1) );
     if (rc == EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
-
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[i] != 33) {
         printf("%d - %zu m1=%d  m2=%d  \n",
                  __LINE__, len, mem1[len], mem2[len]);
+        ++errs;
     }
 
     }
@@ -128,9 +140,9 @@ int test_memcpy_s (void)
     len = LEN/2;
     rc = memcpy_s(mem1, len, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
-
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
@@ -143,6 +155,7 @@ int test_memcpy_s (void)
     if (mem1[len] != 33) {
             printf("%d - %zu m1=%d  m2=%d  \n",
                  __LINE__, len, mem1[len], mem2[len]);
+            ++errs;
     }
     }
 
@@ -154,9 +167,9 @@ int test_memcpy_s (void)
     len = LEN;
     rc = memcpy_s(mem1, len, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
-
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     /* verify mem1 was zeroed */
@@ -164,12 +177,14 @@ int test_memcpy_s (void)
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[len] != 33) {
             printf("%d - %zu m1=%d  m2=%d  \n",
                  __LINE__, len, mem1[len], mem2[len]);
+            ++errs;
     }
 
     }
@@ -182,8 +197,9 @@ int test_memcpy_s (void)
     len = LEN;
     rc = memcpy_s(mem1, len, mem2, RSIZE_MAX_MEM+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     } else {
 
     /* verify mem1 was zeroed */
@@ -191,12 +207,14 @@ int test_memcpy_s (void)
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[len] == 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
     }
 
     }
@@ -208,8 +226,9 @@ int test_memcpy_s (void)
     /* same ptr - no move */
     rc = memcpy_s(mem1, LEN, mem1, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -221,20 +240,23 @@ int test_memcpy_s (void)
     len = 100;
     rc = memcpy_s(&mem1[0], len, &mem1[10], len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[len] == 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
     }
 
     }
@@ -248,14 +270,16 @@ int test_memcpy_s (void)
     len = 100;
     rc = memcpy_s(&mem1[10], len, &mem1[0], len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=10; i<len+10; i++) {
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -269,14 +293,16 @@ int test_memcpy_s (void)
     len = 5;
     rc = memcpy_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 55) {
             printf("%d - %d m1=%d\n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -289,14 +315,16 @@ int test_memcpy_s (void)
 
     rc = memcpy_s(mem1, LEN, mem2, LEN/2);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<LEN/2; i++) {
         if (mem1[i] != 55) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
     }
@@ -304,6 +332,6 @@ int test_memcpy_s (void)
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_memmove16_s.c b/unittests/test_memmove16_s.c
index a096689..7b887f0 100644
--- a/unittests/test_memmove16_s.c
+++ b/unittests/test_memmove16_s.c
@@ -11,9 +11,10 @@
 
 #define LEN   ( 1024 )
 
-int test_memmove16_s()
+int test_memmove16_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     uint32_t len;
 
@@ -24,48 +25,50 @@ int test_memmove16_s()
 
     rc = memmove16_s(NULL, LEN, mem2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+	       __FUNCTION__, __LINE__,  rc);
+	++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove16_s(mem1, 0, mem2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+	       __FUNCTION__, __LINE__,  rc);
+	++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove16_s(mem1, RSIZE_MAX_MEM16+1, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove16_s(mem1, LEN, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove16_s(mem1, 10, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove16_s(mem1, LEN, mem2, RSIZE_MAX_MEM16+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
 /*--------------------------------------------------*/
@@ -77,14 +80,15 @@ int test_memmove16_s()
     len = LEN;
     rc = memmove16_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d m1=%d  m2=%d  \n",
                  i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -99,8 +103,8 @@ int test_memmove16_s()
     len = LEN/2;
     rc = memmove16_s(mem1, len, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -108,6 +112,7 @@ int test_memmove16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -120,8 +125,8 @@ int test_memmove16_s()
     len = LEN;
     rc = memmove16_s(mem1, len, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -129,6 +134,7 @@ int test_memmove16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -143,8 +149,8 @@ int test_memmove16_s()
     len = LEN;
     rc = memmove16_s(mem1, len, mem2, RSIZE_MAX_MEM+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n", __func__, __LINE__, rc);
+	++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -152,6 +158,7 @@ int test_memmove16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -163,8 +170,8 @@ int test_memmove16_s()
     /* same ptr - no move */
     rc = memmove16_s(mem1, LEN, mem1, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
 /*--------------------------------------------------*/
@@ -176,14 +183,15 @@ int test_memmove16_s()
     len = 20;
     rc = memmove16_s(&mem1[0], len, &mem1[10], len);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 35) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -196,19 +204,20 @@ int test_memmove16_s()
     len = 20;
     rc = memmove16_s(&mem1[10], len, &mem1[0], len);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n", __func__, __LINE__,  rc);
+	++errs;
     }
 
     for (i=0; i<10; i++) {
         if (mem1[i] != 25) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memmove32_s.c b/unittests/test_memmove32_s.c
index 51b5a7d..3c1bb28 100644
--- a/unittests/test_memmove32_s.c
+++ b/unittests/test_memmove32_s.c
@@ -11,9 +11,10 @@
 
 #define LEN   ( 1024 )
 
-int test_memmove32_s()
+int test_memmove32_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     uint32_t len;
 
@@ -24,48 +25,54 @@ int test_memmove32_s()
 
     rc = memmove32_s(NULL, LEN, mem2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove32_s(mem1, 0, mem2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove32_s(mem1, RSIZE_MAX_MEM16+1, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove32_s(mem1, LEN, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove32_s(mem1, 10, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove32_s(mem1, LEN, mem2, RSIZE_MAX_MEM16+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -77,14 +84,16 @@ int test_memmove32_s()
     len = LEN;
     rc = memmove32_s(mem1, len, mem2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d m1=%d  m2=%d  \n",
                  i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -99,8 +108,9 @@ int test_memmove32_s()
     len = LEN/2;
     rc = memmove32_s(mem1, len, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -108,6 +118,7 @@ int test_memmove32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -120,8 +131,9 @@ int test_memmove32_s()
     len = LEN;
     rc = memmove32_s(mem1, len, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -129,6 +141,7 @@ int test_memmove32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -143,8 +156,9 @@ int test_memmove32_s()
     len = LEN;
     rc = memmove32_s(mem1, len, mem2, RSIZE_MAX_MEM+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -152,6 +166,7 @@ int test_memmove32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -163,8 +178,9 @@ int test_memmove32_s()
     /* same ptr - no move */
     rc = memmove32_s(mem1, LEN, mem1, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -176,14 +192,16 @@ int test_memmove32_s()
     len = 20;
     rc = memmove32_s(&mem1[0], len, &mem1[10], len);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 35) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -196,19 +214,21 @@ int test_memmove32_s()
     len = 20;
     rc = memmove32_s(&mem1[10], len, &mem1[0], len);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<10; i++) {
         if (mem1[i] != 25) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memmove_s.c b/unittests/test_memmove_s.c
index 5409195..99e09c8 100644
--- a/unittests/test_memmove_s.c
+++ b/unittests/test_memmove_s.c
@@ -16,6 +16,7 @@ static uint8_t  mem2[LEN];
 int test_memmove_s (void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     uint32_t len;
 
@@ -23,48 +24,54 @@ int test_memmove_s (void)
 
     rc = memmove_s(NULL, LEN, mem2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove_s(mem1, 0, mem2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove_s(mem1, RSIZE_MAX_MEM+1, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove_s(mem1, LEN, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove_s(mem1, 10, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memmove_s(mem1, LEN, mem2, RSIZE_MAX_MEM+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -76,14 +83,16 @@ int test_memmove_s (void)
     len = LEN;
     rc = memmove_s(mem1, len, mem2, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != mem2[i]) {
             printf("%d m1=%d  m2=%d  \n",
                  i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
@@ -96,8 +105,9 @@ int test_memmove_s (void)
     len = LEN/2;
     rc = memmove_s(mem1, len, mem2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -105,6 +115,7 @@ int test_memmove_s (void)
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -117,8 +128,9 @@ int test_memmove_s (void)
     len = LEN;
     rc = memmove_s(mem1, len, mem2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -126,6 +138,7 @@ int test_memmove_s (void)
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -138,8 +151,9 @@ int test_memmove_s (void)
     len = LEN;
     rc = memmove_s(mem1, len, mem2, RSIZE_MAX_MEM+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -147,6 +161,7 @@ int test_memmove_s (void)
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -158,8 +173,9 @@ int test_memmove_s (void)
     /* same ptr - no move */
     rc = memmove_s(mem1, LEN, mem1, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -171,14 +187,16 @@ int test_memmove_s (void)
     len = 20;
     rc = memmove_s(&mem1[0], len, &mem1[10], len);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 35) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -191,8 +209,9 @@ int test_memmove_s (void)
     len = 20;
     rc = memmove_s(&mem1[10], len, &mem1[0], len);
     if (rc != EOK) {
-        debug_printf("%s %u  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     for (i=0; i<LEN; i++) { mem2[i] = 25; }
@@ -202,12 +221,13 @@ int test_memmove_s (void)
         if (mem1[i] != 25) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_memset16_s.c b/unittests/test_memset16_s.c
index 3a8bf86..3cc7398 100644
--- a/unittests/test_memset16_s.c
+++ b/unittests/test_memset16_s.c
@@ -11,9 +11,10 @@
 
 #define LEN   ( 256 )
 
-int test_memset16_s()
+int test_memset16_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
     uint32_t i;
     uint16_t value;
@@ -26,8 +27,9 @@ int test_memset16_s()
 
     rc = memset16_s(NULL, LEN, value);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -36,8 +38,9 @@ int test_memset16_s()
 
     rc = memset16_s(mem1, 0, value);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -49,14 +52,16 @@ int test_memset16_s()
 
     rc = memset16_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -69,14 +74,16 @@ int test_memset16_s()
 
     rc = memset16_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -89,14 +96,16 @@ int test_memset16_s()
 
     rc = memset16_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -109,14 +118,16 @@ int test_memset16_s()
 
     rc = memset16_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -129,19 +140,21 @@ int test_memset16_s()
 
     rc = memset16_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memset32_s.c b/unittests/test_memset32_s.c
index 9d1f488..d6a8b4e 100644
--- a/unittests/test_memset32_s.c
+++ b/unittests/test_memset32_s.c
@@ -11,9 +11,10 @@
 
 #define LEN   ( 256 )
 
-int test_memset32_s()
+int test_memset32_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
 
     uint32_t i;
@@ -27,8 +28,9 @@ int test_memset32_s()
 
     rc = memset32_s(NULL, LEN, value);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -39,8 +41,9 @@ int test_memset32_s()
 
     rc = memset32_s(mem1, 0, value);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -52,14 +55,16 @@ int test_memset32_s()
 
     rc = memset32_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d  \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -72,14 +77,16 @@ int test_memset32_s()
 
     rc = memset32_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d  \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -92,14 +99,16 @@ int test_memset32_s()
 
     rc = memset32_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d  \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -112,14 +121,16 @@ int test_memset32_s()
 
     rc = memset32_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d  \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -132,19 +143,21 @@ int test_memset32_s()
 
     rc = memset32_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d  \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memset_s.c b/unittests/test_memset_s.c
index a701c39..996f0ed 100644
--- a/unittests/test_memset_s.c
+++ b/unittests/test_memset_s.c
@@ -15,6 +15,7 @@ static uint8_t mem1[LEN];
 int test_memset_s (void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
     uint32_t i;
 
@@ -26,8 +27,9 @@ int test_memset_s (void)
 
     rc = memset_s(NULL, LEN, value);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -36,8 +38,9 @@ int test_memset_s (void)
 
     rc = memset_s(mem1, 0, value);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -49,14 +52,16 @@ int test_memset_s (void)
 
     rc = memset_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -69,14 +74,16 @@ int test_memset_s (void)
 
     rc = memset_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -89,14 +96,16 @@ int test_memset_s (void)
 
     rc = memset_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -109,14 +118,16 @@ int test_memset_s (void)
 
     rc = memset_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -129,20 +140,22 @@ int test_memset_s (void)
 
     rc = memset_s(mem1, len, value);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_memzero16_s.c b/unittests/test_memzero16_s.c
index de63991..a595b1a 100644
--- a/unittests/test_memzero16_s.c
+++ b/unittests/test_memzero16_s.c
@@ -11,9 +11,10 @@
 
 #define LEN   ( 512 )
 
-int test_memzero16_s()
+int test_memzero16_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     uint32_t len;
 
@@ -23,24 +24,27 @@ int test_memzero16_s()
 
     rc = memzero16_s(NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memzero16_s(mem1, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memzero16_s(mem1, RSIZE_MAX_MEM16+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -50,8 +54,9 @@ int test_memzero16_s()
     len = 1;
     rc = memzero16_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -59,6 +64,7 @@ int test_memzero16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -69,8 +75,9 @@ int test_memzero16_s()
     len = 2;
     rc = memzero16_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -78,6 +85,7 @@ int test_memzero16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -88,8 +96,9 @@ int test_memzero16_s()
     len = 3;
     rc = memzero16_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -97,6 +106,7 @@ int test_memzero16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -107,8 +117,9 @@ int test_memzero16_s()
     len = LEN;
     rc = memzero16_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -116,11 +127,12 @@ int test_memzero16_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memzero32_s.c b/unittests/test_memzero32_s.c
index 67369b0..f96d45e 100644
--- a/unittests/test_memzero32_s.c
+++ b/unittests/test_memzero32_s.c
@@ -11,9 +11,10 @@
 
 #define LEN   ( 512 )
 
-int test_memzero32_s()
+int test_memzero32_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     uint32_t len;
 
@@ -23,24 +24,27 @@ int test_memzero32_s()
 
     rc = memzero32_s(NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memzero32_s(mem1, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memzero32_s(mem1, RSIZE_MAX_MEM32+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -50,8 +54,9 @@ int test_memzero32_s()
     len = 1;
     rc = memzero32_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -59,6 +64,7 @@ int test_memzero32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -69,8 +75,9 @@ int test_memzero32_s()
     len = 2;
     rc = memzero32_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -78,6 +85,7 @@ int test_memzero32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -88,8 +96,9 @@ int test_memzero32_s()
     len = 3;
     rc = memzero32_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -97,6 +106,7 @@ int test_memzero32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -107,8 +117,9 @@ int test_memzero32_s()
     len = LEN;
     rc = memzero32_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -116,11 +127,12 @@ int test_memzero32_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i] );
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_memzero_s.c b/unittests/test_memzero_s.c
index 89b0f6c..23b24d3 100644
--- a/unittests/test_memzero_s.c
+++ b/unittests/test_memzero_s.c
@@ -11,9 +11,10 @@
 
 #define LEN   ( 512 )
 
-int test_memzero_s()
+int test_memzero_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     uint32_t len;
 
@@ -23,24 +24,27 @@ int test_memzero_s()
 
     rc = memzero_s(NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memzero_s(mem1, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = memzero_s(mem1, RSIZE_MAX_MEM+1);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -50,8 +54,9 @@ int test_memzero_s()
     len = 1;
     rc = memzero_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -59,6 +64,7 @@ int test_memzero_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -69,8 +75,9 @@ int test_memzero_s()
     len = 2;
     rc = memzero_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -78,6 +85,7 @@ int test_memzero_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -88,8 +96,9 @@ int test_memzero_s()
     len = 3;
     rc = memzero_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -97,6 +106,7 @@ int test_memzero_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -107,8 +117,9 @@ int test_memzero_s()
     len = LEN;
     rc = memzero_s(mem1, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__, rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* verify mem1 was zeroed */
@@ -116,11 +127,12 @@ int test_memzero_s()
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i] );
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_stpcpy_s.c b/unittests/test_stpcpy_s.c
index a2afa42..1bb9ca0 100644
--- a/unittests/test_stpcpy_s.c
+++ b/unittests/test_stpcpy_s.c
@@ -81,6 +81,7 @@ static char   str2[LEN];
 int test_stpcpy_s (void)
 {
 	char *ret;
+    int errs = 0;
     errno_t rc;
 #ifdef SAFE_LIB_STR_NULL_SLACK
     uint32_t i;
@@ -97,11 +98,13 @@ int test_stpcpy_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -112,10 +115,12 @@ int test_stpcpy_s (void)
 	if (rc != ESZEROL) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 	if (ret != NULL) {
 		printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 
@@ -127,10 +132,12 @@ int test_stpcpy_s (void)
 	if (rc != ESLEMAX) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 	if (ret != NULL) {
 		printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -143,11 +150,13 @@ int test_stpcpy_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -155,12 +164,14 @@ int test_stpcpy_s (void)
         if (str1[i] != '\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != '\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -175,12 +186,14 @@ int test_stpcpy_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
     if (ret != NULL) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
@@ -194,11 +207,13 @@ int test_stpcpy_s (void)
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
 		printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -213,10 +228,12 @@ int test_stpcpy_s (void)
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 	if (ret != NULL) {
 		printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -224,12 +241,14 @@ int test_stpcpy_s (void)
 		if (str1[i] != '\0') {
 			printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+			++errs;
 		}
 	}
 #else
 	if (str1[0] != '\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #endif
 
@@ -246,10 +265,12 @@ int test_stpcpy_s (void)
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 	if (ret != NULL) {
 		printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -257,12 +278,14 @@ int test_stpcpy_s (void)
 		if (str1[i] != '\0') {
 			printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+			++errs;
 		}
 	}
 #else
 	if (str1[5] != '\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #endif
 
@@ -285,10 +308,12 @@ int test_stpcpy_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str1) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -296,12 +321,14 @@ int test_stpcpy_s (void)
         if (str1[i] != '\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != '\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -317,15 +344,18 @@ int test_stpcpy_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str2) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str2 != '\0') {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -339,6 +369,7 @@ int test_stpcpy_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -346,11 +377,13 @@ int test_stpcpy_s (void)
     if (ind != 0) {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -364,11 +397,13 @@ int test_stpcpy_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -376,6 +411,7 @@ int test_stpcpy_s (void)
     if (ind != 0) {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -389,15 +425,18 @@ int test_stpcpy_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -411,15 +450,18 @@ int test_stpcpy_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str2 != '\0') {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -433,6 +475,7 @@ int test_stpcpy_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -440,10 +483,12 @@ int test_stpcpy_s (void)
     if (ind != 0) {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -457,10 +502,12 @@ int test_stpcpy_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str2+strnlen_s(str2, LEN) ) {
     	printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcpy */
@@ -468,11 +515,12 @@ int test_stpcpy_s (void)
     if (ind != 0) {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_stpncpy_s.c b/unittests/test_stpncpy_s.c
index f8d288a..77684b9 100644
--- a/unittests/test_stpncpy_s.c
+++ b/unittests/test_stpncpy_s.c
@@ -88,6 +88,7 @@ extern char *stpncpy_s(char *dest, rsize_t dmax, const char *src, rsize_t smax,
 
 int test_stpncpy_s (void)
 {
+    int errs = 0;
     char *ret;
     errno_t rc;
     uint32_t i;
@@ -105,11 +106,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -120,10 +123,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
@@ -135,10 +140,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -151,11 +158,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -163,12 +172,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != '\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != '\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -184,12 +195,14 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
@@ -204,11 +217,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -223,10 +238,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -234,12 +251,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != '\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != '\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -256,10 +275,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -267,12 +288,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != '\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[5] != '\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -295,10 +318,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str1) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -306,12 +331,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != '\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != '\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -327,15 +354,18 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str2) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str2 != '\0') {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -351,6 +381,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -358,11 +389,13 @@ printf("Test #%d:\n", ++testno);
     if (ind != 0) {
         printf("%s %u -%s- <> -%s-  (smax=%zu) Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, str2, sz, rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -376,11 +409,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     } else {
 
         /* be sure the results are the same as strcmp */
@@ -389,12 +424,14 @@ printf("Test #%d:\n", ++testno);
         if (ind != 0 || sz != 3) {
             printf("%s %u -%s- <> -%s-  (smax=%zu) Error rc=%u \n",
                          __FUNCTION__, __LINE__,  str1, str2, sz, rc );
+            ++errs;
         }
         /* be sure that the slack is correct */
         for (i=1; i<6; i++) {
             if (ret[i] != 'x') {
                 printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                      __FUNCTION__, __LINE__,  i, rc );
+                ++errs;
             }
         }
     }
@@ -410,11 +447,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     } else {
 
         /* be sure the results are the same as strcmp */
@@ -422,12 +461,14 @@ printf("Test #%d:\n", ++testno);
         if (ind != 0) {
             printf("%s %u -%s-  Error rc=%u \n",
                          __FUNCTION__, __LINE__,  str1, rc );
+            ++errs;
         } else {
             /* be sure that the nulls are correct */
             for (i=0; i<5; i++) {
                 if (ret[i] != '\0') {
                     printf("%s %u Incorrect NULL fill at returned ptr index %d  Error rc=%u \n",
                                          __FUNCTION__, __LINE__,  i, rc );
+                    ++errs;
                 }
             }
             /* be sure that the slack is correct */
@@ -435,6 +476,7 @@ printf("Test #%d:\n", ++testno);
                 if (ret[i] != 'x') {
                     printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                          __FUNCTION__, __LINE__,  i, rc );
+                    ++errs;
                 }
             }
         }
@@ -451,11 +493,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     } else {
 
         /* be sure the results are the same as strcmp */
@@ -463,12 +507,14 @@ printf("Test #%d:\n", ++testno);
         if (ind != 0) {
             printf("%s %u -%s-  Error rc=%u \n",
                          __FUNCTION__, __LINE__,  str1, rc );
+            ++errs;
         } else {
             /* be sure that the slack is correct */
             for (i=1; i<5; i++) {
                 if (ret[i] != 'x') {
                     printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                          __FUNCTION__, __LINE__,  i, rc );
+                    ++errs;
                 }
             }
         }
@@ -485,11 +531,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     } else {
 
         /* be sure the results are the same as strcmp */
@@ -497,12 +545,14 @@ printf("Test #%d:\n", ++testno);
         if (ind != 0) {
             printf("%s %u -%s-  Error rc=%u \n",
                          __FUNCTION__, __LINE__,  str1, rc );
+            ++errs;
         } else {
             /* be sure that the slack is correct */
             for (i=1; i<5; i++) {
                 if (ret[i] != 'x') {
                     printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                          __FUNCTION__, __LINE__,  i, rc );
+                    ++errs;
                 }
             }
         }
@@ -520,15 +570,18 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -543,15 +596,18 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -566,6 +622,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -573,10 +630,12 @@ printf("Test #%d:\n", ++testno);
     if (ind != 0) {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -590,10 +649,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != '\0' || ret != str1+strnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcpy */
@@ -601,10 +662,11 @@ printf("Test #%d:\n", ++testno);
     if (ind != 0) {
         printf("%s %u -%s-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
  /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_strcasecmp_s.c b/unittests/test_strcasecmp_s.c
index c54892f..001e3bd 100644
--- a/unittests/test_strcasecmp_s.c
+++ b/unittests/test_strcasecmp_s.c
@@ -17,6 +17,7 @@ static char   str2[LEN];
 int test_strcasecmp_s (void)
 {
     errno_t rc;
+    int errs = 0;
 
     int ind;
     int std_ind;
@@ -27,11 +28,13 @@ int test_strcasecmp_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -40,11 +43,13 @@ int test_strcasecmp_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -53,6 +58,7 @@ int test_strcasecmp_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -61,11 +67,13 @@ int test_strcasecmp_s (void)
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -74,11 +82,13 @@ int test_strcasecmp_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -90,17 +100,20 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     std_ind = strcasecmp(str1, str2);
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -112,11 +125,13 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 /*--------------------------------------------------*/
 
@@ -127,11 +142,13 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -143,11 +160,13 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -159,17 +178,20 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = strcasecmp(str1, str2);
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -181,11 +203,13 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -196,11 +220,13 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -212,11 +238,13 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != ('I' - 'E')) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -228,15 +256,17 @@ int test_strcasecmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != ('1' - 'I')) {
         printf("%s %u  Error ind=%d  rc=%d  %d \n",
                      __FUNCTION__, __LINE__,  ind, rc, ('1' - 'I'));
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_strcasestr_s.c b/unittests/test_strcasestr_s.c
index 6e9eb5b..fb5de23 100644
--- a/unittests/test_strcasestr_s.c
+++ b/unittests/test_strcasestr_s.c
@@ -15,6 +15,7 @@ extern errno_t strcasestr_s (char *dest, rsize_t dmax, const char *src, rsize_t
 
 int test_strcasestr_s()
 {
+    int errs = 0;
     errno_t rc;
     char *sub;
     char *std_sub;
@@ -32,11 +33,13 @@ int test_strcasestr_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -45,11 +48,13 @@ int test_strcasestr_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -58,6 +63,7 @@ int test_strcasestr_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -66,11 +72,13 @@ int test_strcasestr_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -79,11 +87,13 @@ int test_strcasestr_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -92,11 +102,13 @@ int test_strcasestr_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -105,11 +117,13 @@ int test_strcasestr_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -121,11 +135,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != str1) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* compare to legacy */
@@ -137,6 +153,7 @@ int test_strcasestr_s()
         printf("str2:[%s]\n", str2);
         printf("strcasestr_s returns:[%p]\n", sub);
         printf("strcasestr   returns:[%p]\n\n", std_sub);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -148,11 +165,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != str1) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* compare to legacy */
@@ -164,6 +183,7 @@ int test_strcasestr_s()
         printf("str2:[%s]\n", str2);
         printf("strcasestr_s returns:[%p]\n", sub);
         printf("strcasestr   returns:[%p]\n\n", std_sub);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -176,11 +196,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != str1) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* compare to legacy */
@@ -192,6 +214,7 @@ int test_strcasestr_s()
         printf("str2:[%s]\n", str2);
         printf("strcasestr_s returns:[%p]\n", sub);
         printf("strcasestr   returns:[%p]\n\n", std_sub);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -204,11 +227,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[0]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -221,11 +246,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[1]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -238,11 +265,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[15]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -258,11 +287,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[18]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* compare to legacy */
@@ -274,6 +305,7 @@ int test_strcasestr_s()
         printf("str2:[%s]\n", str2);
         printf("strcasestr_s returns:[%p]\n", sub);
         printf("strcasestr   returns:[%p]\n\n", std_sub);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -289,11 +321,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[18]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* compare to legacy */
@@ -305,6 +339,7 @@ int test_strcasestr_s()
         printf("str2:[%s]\n", str2);
         printf("strcasestr_s returns:[%p]\n", sub);
         printf("strcasestr   returns:[%p]\n\n", std_sub);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -316,11 +351,13 @@ int test_strcasestr_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != NULL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -332,11 +369,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[5]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -348,11 +387,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[5]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -364,11 +405,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[5]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -381,11 +424,13 @@ int test_strcasestr_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != NULL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -397,11 +442,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[5]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -414,11 +461,13 @@ int test_strcasestr_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[1]) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* compare to legacy */
@@ -426,9 +475,10 @@ int test_strcasestr_s()
     if ((int)sub != (int)std_sub) { // comparison to handle 32-bit library return and 64-bit library return
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strcat_s.c b/unittests/test_strcat_s.c
index 2e6f700..614c26a 100644
--- a/unittests/test_strcat_s.c
+++ b/unittests/test_strcat_s.c
@@ -16,6 +16,7 @@ static char   str2[LEN];
 int test_strcat_s (void)
 {
     errno_t rc;
+    int errs = 0;
     int32_t  ind;
     int32_t  len1;
     int32_t  len2;
@@ -25,32 +26,36 @@ int test_strcat_s (void)
 
     rc = strcat_s(NULL, LEN, str2);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcat_s(str1, LEN, NULL);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcat_s(str1, 0, str2);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcat_s(str1, (RSIZE_MAX_STR+1), str2);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -61,13 +66,15 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 1, str2);
     if (rc != ESUNTERM) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -77,13 +84,15 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 2, str2);
     if (rc != ESUNTERM) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -96,14 +105,16 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 50, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     len3 = strlen(str1);
     if (len3 != (len1+len2)) {
-        debug_printf("%s %u lengths wrong: %u  %u  %u \n",
-                     __FUNCTION__, __LINE__, len1, len2, len3);
+        printf("%s %u lengths wrong: %u  %u  %u \n",
+               __FUNCTION__, __LINE__, len1, len2, len3);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -114,13 +125,15 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 1, str2);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -130,13 +143,15 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 2, str2);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -146,14 +161,16 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 20, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, str2 );
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -164,13 +181,15 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, LEN, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -180,14 +199,16 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, LEN, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -197,14 +218,16 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, LEN, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, "qqweqqkeep it simple");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -214,8 +237,9 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 12, str2);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -225,14 +249,16 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 52, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, "1234keep it simple");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -241,13 +267,15 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 8, &str1[7]);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -256,13 +284,15 @@ int test_strcat_s (void)
 
     rc = strcat_s(str1, 9, &str1[8]);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -272,14 +302,16 @@ int test_strcat_s (void)
 
     rc = strcat_s(str2, 31, &str1[0]);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str2, "123keep it simple");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -289,19 +321,21 @@ int test_strcat_s (void)
 
     rc = strcat_s(str2, 10, str1);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str2, "123456789");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_strcmp_s.c b/unittests/test_strcmp_s.c
index b15fff5..4920a6e 100644
--- a/unittests/test_strcmp_s.c
+++ b/unittests/test_strcmp_s.c
@@ -17,6 +17,7 @@ static char   str2[LEN];
 int test_strcmp_s (void)
 {
     errno_t rc;
+    int errs = 0;
     int ind;
     int std_ind;
 
@@ -26,11 +27,13 @@ int test_strcmp_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -39,11 +42,13 @@ int test_strcmp_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -52,6 +57,7 @@ int test_strcmp_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -60,11 +66,13 @@ int test_strcmp_s (void)
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,11 +81,13 @@ int test_strcmp_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,17 +99,20 @@ int test_strcmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%d rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
     std_ind = strcmp(str1, str2);
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -111,11 +124,13 @@ int test_strcmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -128,17 +143,20 @@ int test_strcmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != (-32)) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = strcmp(str1, str2);
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -151,17 +169,20 @@ int test_strcmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 32) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     std_ind = strcmp(str1, str2);
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -172,11 +193,13 @@ int test_strcmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -184,6 +207,7 @@ int test_strcmp_s (void)
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -195,11 +219,13 @@ int test_strcmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind <= 0) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -207,6 +233,7 @@ int test_strcmp_s (void)
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -218,11 +245,13 @@ int test_strcmp_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind >= 0) {
         printf("%s %u  Error ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
@@ -230,11 +259,12 @@ int test_strcmp_s (void)
     if (ind != std_ind) {
         printf("%s %u  ind=%d  std_ind=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, std_ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_strcmpfld_s.c b/unittests/test_strcmpfld_s.c
index 8a2d8d9..0a55b0e 100644
--- a/unittests/test_strcmpfld_s.c
+++ b/unittests/test_strcmpfld_s.c
@@ -11,9 +11,10 @@
 #define MAX   ( 128 )
 #define LEN   ( 128 )
 
-int test_strcmpfld_s()
+int test_strcmpfld_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     rsize_t len;
     int ind;
@@ -26,8 +27,9 @@ int test_strcmpfld_s()
 
     rc = strcmpfld_s(NULL, LEN, str2, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -35,8 +37,9 @@ int test_strcmpfld_s()
     len = 5;
     rc = strcmpfld_s(str1, len, NULL, &ind);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -44,24 +47,27 @@ int test_strcmpfld_s()
     len = 5;
     rc = strcmpfld_s(str1, len, str2, NULL);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcmpfld_s(str1, 0, str2, &ind);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcmpfld_s(str1, (RSIZE_MAX_STR+1), str2, &ind);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,14 +79,16 @@ int test_strcmpfld_s()
     len = 1;
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            ++errs;
         }
     }
 
@@ -92,14 +100,16 @@ int test_strcmpfld_s()
     len = 2;
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+               __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            ++errs;
         }
     }
 
@@ -111,14 +121,16 @@ int test_strcmpfld_s()
     len = 3;
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+	    ++errs;
         }
     }
 
@@ -130,14 +142,16 @@ int test_strcmpfld_s()
     len = strlen(str1);
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+	    ++errs;
         }
     }
 
@@ -153,14 +167,16 @@ int test_strcmpfld_s()
     len = strlen(str1);
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+	    ++errs;
         }
     }
 
@@ -177,14 +193,16 @@ int test_strcmpfld_s()
 
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+	    ++errs;
         }
     }
 
@@ -199,14 +217,16 @@ int test_strcmpfld_s()
 
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+	    ++errs;
         }
     }
 
@@ -223,18 +243,20 @@ int test_strcmpfld_s()
 
     rc = strcmpfld_s(str1, len, str2, &ind);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  ind=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  ind, rc );
+	    ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strcpy_s.c b/unittests/test_strcpy_s.c
index 5fa9883..51de923 100644
--- a/unittests/test_strcpy_s.c
+++ b/unittests/test_strcpy_s.c
@@ -17,6 +17,7 @@ static char   str2[LEN];
 int test_strcpy_s (void)
 {
     errno_t rc;
+    int errs = 0;
 #ifdef SAFE_LIB_STR_NULL_SLACK
     uint32_t i;
 #endif /*SAFE_LIB_STR_NULL_SLACK*/
@@ -26,8 +27,9 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(NULL, LEN, str2);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -36,21 +38,24 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, 5, NULL);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<5; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++err;
         }
     }
 #else
     if (str1[0] != '\0') {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -58,16 +63,18 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, 0, str2);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcpy_s(str1, (RSIZE_MAX_STR+1), str2);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -78,21 +85,24 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, LEN/2, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<LEN/2; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != '\0') {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -102,8 +112,9 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, LEN, str1);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -112,21 +123,24 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(&str1[0], LEN, &str1[5]);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<LEN; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != '\0') {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -137,13 +151,15 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, LEN, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -153,15 +169,17 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, LEN, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -171,15 +189,17 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, LEN, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -189,13 +209,15 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, 1, str2);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -205,13 +227,15 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, 2, str2);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -221,15 +245,17 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, 3, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -239,15 +265,17 @@ int test_strcpy_s (void)
 
     rc = strcpy_s(str1, 10, str2);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcpy */
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
     /*
@@ -257,7 +285,7 @@ int test_strcpy_s (void)
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_strcpyfld_s.c b/unittests/test_strcpyfld_s.c
index 059a330..97b2bfd 100644
--- a/unittests/test_strcpyfld_s.c
+++ b/unittests/test_strcpyfld_s.c
@@ -11,9 +11,10 @@
 #define MAX   ( 128 )
 #define LEN   ( 128 )
 
-int test_strcpyfld_s()
+int test_strcpyfld_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     rsize_t len;
     rsize_t slen;
@@ -26,8 +27,9 @@ int test_strcpyfld_s()
 
     rc = strcpyfld_s(NULL, LEN, str2, slen);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -38,14 +40,16 @@ int test_strcpyfld_s()
     slen = 5;
     rc = strcpyfld_s(str1, len, NULL, slen);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 
@@ -55,8 +59,9 @@ int test_strcpyfld_s()
     slen = 5;
     rc = strcpyfld_s(str1, 0, str2, slen);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -65,8 +70,9 @@ int test_strcpyfld_s()
     slen = 5;
     rc = strcpyfld_s(str1, (RSIZE_MAX_STR+1), str2, slen);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -75,8 +81,9 @@ int test_strcpyfld_s()
     slen = 0;
     rc = strcpyfld_s(str1, len, str2, slen);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -85,8 +92,9 @@ int test_strcpyfld_s()
     slen = len+1;
     rc = strcpyfld_s(str1, (RSIZE_MAX_STR+1), str2, slen);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -101,14 +109,16 @@ int test_strcpyfld_s()
 
     rc = strcpyfld_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
+               __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+	    ++errs;
         }
     }
 
@@ -123,14 +133,16 @@ int test_strcpyfld_s()
 
     rc = strcpyfld_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
+               __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+	    ++errs;
         }
     }
 
@@ -145,14 +157,16 @@ int test_strcpyfld_s()
 
     rc = strcpyfld_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            ++errs;
         }
     }
 
@@ -167,14 +181,16 @@ int test_strcpyfld_s()
 
     rc = strcpyfld_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            ++errs;
         }
     }
 
@@ -191,19 +207,21 @@ int test_strcpyfld_s()
 
     rc = strcpyfld_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<slen; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d   rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i],  rc );
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strcpyfldin_s.c b/unittests/test_strcpyfldin_s.c
index 0ddcb6b..00b321c 100644
--- a/unittests/test_strcpyfldin_s.c
+++ b/unittests/test_strcpyfldin_s.c
@@ -11,9 +11,10 @@
 #define MAX   ( 128 )
 #define LEN   ( 128 )
 
-int test_strcpyfldin_s()
+int test_strcpyfldin_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     rsize_t len;
     rsize_t slen;
@@ -26,8 +27,9 @@ int test_strcpyfldin_s()
 
     rc = strcpyfldin_s(NULL, LEN, str2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -35,14 +37,16 @@ int test_strcpyfldin_s()
     len = 5;
     rc = strcpyfldin_s(str1, len, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 
@@ -50,16 +54,18 @@ int test_strcpyfldin_s()
 
     rc = strcpyfldin_s(str1, 0, str2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcpyfldin_s(str1, (RSIZE_MAX_STR+1), str2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,14 +79,16 @@ int test_strcpyfldin_s()
 
     rc = strcpyfldin_s(str1, len, str2, slen);
     if (rc == EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != 0) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -92,14 +100,16 @@ int test_strcpyfldin_s()
     len = 1;
     rc = strcpyfldin_s(str1, len, str2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -111,14 +121,16 @@ int test_strcpyfldin_s()
     len = 2;
     rc = strcpyfldin_s(str1, len, str2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -130,14 +142,16 @@ int test_strcpyfldin_s()
     len = 3;
     rc = strcpyfldin_s(str1, len, str2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -150,14 +164,16 @@ int test_strcpyfldin_s()
     len = LEN;
     rc = strcpyfldin_s(str1, len, str1, len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -169,14 +185,16 @@ int test_strcpyfldin_s()
     /* overlap */
     rc = strcpyfldin_s(&str1[0], len, &str1[5], len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -188,14 +206,16 @@ int test_strcpyfldin_s()
     /* overlap */
     rc = strcpyfldin_s(&str1[10], len, &str1[0], len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=10; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -208,14 +228,16 @@ int test_strcpyfldin_s()
 
     rc = strcpyfldin_s(str1, len, str2, len);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -229,18 +251,20 @@ int test_strcpyfldin_s()
 
     rc = strcpyfldin_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<slen; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strcpyfldout_s.c b/unittests/test_strcpyfldout_s.c
index cb0d14b..2bd7211 100644
--- a/unittests/test_strcpyfldout_s.c
+++ b/unittests/test_strcpyfldout_s.c
@@ -11,9 +11,10 @@
 #define MAX   ( 128 )
 #define LEN   ( 128 )
 
-int test_strcpyfldout_s()
+int test_strcpyfldout_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     rsize_t len;
     rsize_t slen;
@@ -26,8 +27,9 @@ int test_strcpyfldout_s()
 
     rc = strcpyfldout_s(NULL, LEN, str2, slen);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -35,14 +37,16 @@ int test_strcpyfldout_s()
     len = 5;
     rc = strcpyfldout_s(str1, len, NULL, len);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 
@@ -50,16 +54,18 @@ int test_strcpyfldout_s()
 
     rc = strcpyfldout_s(str1, 0, str2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strcpyfldout_s(str1, (RSIZE_MAX_STR+1), str2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -68,8 +74,9 @@ int test_strcpyfldout_s()
     slen = 0;
     rc = strcpyfldout_s(str1, len, str2, slen);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -78,8 +85,9 @@ int test_strcpyfldout_s()
     slen = 6;
     rc = strcpyfldout_s(str1, len, str2, slen);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -92,15 +100,17 @@ int test_strcpyfldout_s()
     slen = 1;
     rc = strcpyfldout_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* str1 becomes null */
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
                    __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -113,14 +123,16 @@ int test_strcpyfldout_s()
     slen = 2;
     rc = strcpyfldout_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len-1; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -133,14 +145,16 @@ int test_strcpyfldout_s()
     slen = 3;
     rc = strcpyfldout_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len-1; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -153,14 +167,16 @@ int test_strcpyfldout_s()
     len = LEN;
     rc = strcpyfldout_s(str1, len, str1, len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -172,14 +188,16 @@ int test_strcpyfldout_s()
     /* overlap */
     rc = strcpyfldout_s(&str1[0], len, &str1[5], len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -191,14 +209,16 @@ int test_strcpyfldout_s()
     /* overlap */
     rc = strcpyfldout_s(&str1[10], len, &str1[0], len);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=10; i<len; i++) {
         if (str1[i] != '\0') {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -212,14 +232,16 @@ int test_strcpyfldout_s()
 
     rc = strcpyfldout_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<len-1; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
@@ -233,18 +255,20 @@ int test_strcpyfldout_s()
 
     rc = strcpyfldout_s(str1, len, str2, slen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     for (i=0; i<slen; i++) {
         if (str1[i] != str2[i]) {
-            debug_printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
-                     __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            printf("%s %u  diff s1[%d]=%d  s2[%d]=%d  rc=%u \n",
+                   __FUNCTION__, __LINE__, i, str1[i], i, str2[i], rc);
+            ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strcspn_s.c b/unittests/test_strcspn_s.c
index 0abfe63..87fc064 100644
--- a/unittests/test_strcspn_s.c
+++ b/unittests/test_strcspn_s.c
@@ -17,6 +17,7 @@ static char   str2[LEN];
 int test_strcspn_s (void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t count;
     int std_count;
     unsigned int testno = 0;
@@ -31,11 +32,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -46,11 +49,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -61,6 +66,7 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -71,11 +77,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -86,11 +94,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -101,11 +111,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -116,11 +128,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -134,17 +148,20 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
     std_count = strcspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -159,11 +176,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 1) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -178,11 +197,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 2) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -197,11 +218,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 3) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 
@@ -217,11 +240,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 6) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -236,11 +261,13 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 6) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -255,12 +282,14 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strcspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -275,12 +304,14 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strcspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -295,16 +326,18 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strcspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_strfirstchar_s.c b/unittests/test_strfirstchar_s.c
index 75f16aa..2eab43a 100644
--- a/unittests/test_strfirstchar_s.c
+++ b/unittests/test_strfirstchar_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 #define SHORT_LEN  ( 5 )
 
-int test_strfirstchar_s()
+int test_strfirstchar_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t  len;
 
     char *first;
@@ -25,11 +26,13 @@ int test_strfirstchar_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -38,6 +41,7 @@ int test_strfirstchar_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -46,11 +50,13 @@ int test_strfirstchar_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -59,11 +65,13 @@ int test_strfirstchar_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -74,11 +82,13 @@ int test_strfirstchar_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,11 +99,13 @@ int test_strfirstchar_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -104,11 +116,13 @@ int test_strfirstchar_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first != &str1[1]) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -120,11 +134,13 @@ int test_strfirstchar_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first != &str1[14]) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -135,14 +151,16 @@ int test_strfirstchar_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first != &str1[14]) {
         printf("%s %u  Error  str1=%p  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strfirstdiff_s.c b/unittests/test_strfirstdiff_s.c
index 1dc2140..2e7f114 100644
--- a/unittests/test_strfirstdiff_s.c
+++ b/unittests/test_strfirstdiff_s.c
@@ -12,9 +12,10 @@
 #define SHORT_LEN  ( 5 )
 
 
-int test_strfirstdiff_s()
+int test_strfirstdiff_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t ind;
 
     char   str1[LEN];
@@ -26,11 +27,13 @@ int test_strfirstdiff_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -39,11 +42,13 @@ int test_strfirstdiff_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -52,6 +57,7 @@ int test_strfirstdiff_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -60,11 +66,13 @@ int test_strfirstdiff_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,11 +81,13 @@ int test_strfirstdiff_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,11 +99,13 @@ int test_strfirstdiff_s()
     if (rc != ESNODIFF) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -105,11 +117,13 @@ int test_strfirstdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -121,11 +135,13 @@ int test_strfirstdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 1) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -137,11 +153,13 @@ int test_strfirstdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 2) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -152,11 +170,13 @@ int test_strfirstdiff_s()
     if (rc != ESNODIFF) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -168,11 +188,13 @@ int test_strfirstdiff_s()
     if (rc != ESNODIFF) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -184,11 +206,13 @@ int test_strfirstdiff_s()
     if (rc != ESNODIFF) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -200,11 +224,13 @@ int test_strfirstdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 13) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -216,14 +242,16 @@ int test_strfirstdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 13) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strfirstsame_s.c b/unittests/test_strfirstsame_s.c
index cef3bc7..df3db5d 100644
--- a/unittests/test_strfirstsame_s.c
+++ b/unittests/test_strfirstsame_s.c
@@ -12,9 +12,10 @@
 #define SHORT_LEN  ( 5 )
 
 
-int test_strfirstsame_s()
+int test_strfirstsame_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t ind;
 
     char   str1[LEN];
@@ -26,11 +27,13 @@ int test_strfirstsame_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -39,11 +42,13 @@ int test_strfirstsame_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -52,6 +57,7 @@ int test_strfirstsame_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -60,11 +66,13 @@ int test_strfirstsame_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,11 +81,13 @@ int test_strfirstsame_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,11 +99,13 @@ int test_strfirstsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -105,11 +117,13 @@ int test_strfirstsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -121,11 +135,13 @@ int test_strfirstsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 1) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -137,11 +153,13 @@ int test_strfirstsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 4) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -153,11 +171,13 @@ int test_strfirstsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -169,11 +189,13 @@ int test_strfirstsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 13) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -185,11 +207,13 @@ int test_strfirstsame_s()
     if (rc != EOK) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -201,11 +225,13 @@ int test_strfirstsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -217,11 +243,13 @@ int test_strfirstsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -233,14 +261,16 @@ int test_strfirstsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strisalphanumeric_s.c b/unittests/test_strisalphanumeric_s.c
index 25cb5a9..9f8b33a 100644
--- a/unittests/test_strisalphanumeric_s.c
+++ b/unittests/test_strisalphanumeric_s.c
@@ -12,9 +12,10 @@
 #define LEN   ( 128 )
 
 
-int test_strisalphanumeric_s()
+int test_strisalphanumeric_s(void)
 {
     bool rc;
+    int errs = 0;
 
     uint32_t len;
     char   str[LEN];
@@ -26,6 +27,7 @@ int test_strisalphanumeric_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -35,6 +37,7 @@ int test_strisalphanumeric_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -45,6 +48,7 @@ int test_strisalphanumeric_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -54,6 +58,7 @@ int test_strisalphanumeric_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -65,6 +70,7 @@ int test_strisalphanumeric_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -75,6 +81,7 @@ int test_strisalphanumeric_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -86,6 +93,7 @@ int test_strisalphanumeric_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -97,6 +105,7 @@ int test_strisalphanumeric_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -108,6 +117,7 @@ int test_strisalphanumeric_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -121,6 +131,7 @@ int test_strisalphanumeric_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -132,9 +143,10 @@ int test_strisalphanumeric_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strisascii_s.c b/unittests/test_strisascii_s.c
index 7737df9..eb78a07 100644
--- a/unittests/test_strisascii_s.c
+++ b/unittests/test_strisascii_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strisascii_s()
+int test_strisascii_s(void)
 {
     bool rc;
+    int errs = 0;
 
     uint32_t len;
     char   str[LEN];
@@ -25,6 +26,7 @@ int test_strisascii_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -34,6 +36,7 @@ int test_strisascii_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -43,6 +46,7 @@ int test_strisascii_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -52,6 +56,7 @@ int test_strisascii_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -62,6 +67,7 @@ int test_strisascii_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,6 +79,7 @@ int test_strisascii_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,6 +91,7 @@ int test_strisascii_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -95,6 +103,7 @@ int test_strisascii_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -105,6 +114,7 @@ int test_strisascii_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -118,9 +128,10 @@ int test_strisascii_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strisdigit_s.c b/unittests/test_strisdigit_s.c
index 268ffe2..e2278cc 100644
--- a/unittests/test_strisdigit_s.c
+++ b/unittests/test_strisdigit_s.c
@@ -10,9 +10,10 @@
 #define LEN   ( 128 )
 
 
-int test_strisdigit_s()
+int test_strisdigit_s(void)
 {
     bool rc;
+    int errs = 0;
 
     uint32_t len;
     char   str[LEN];
@@ -24,6 +25,7 @@ int test_strisdigit_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -33,6 +35,7 @@ int test_strisdigit_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,6 +45,7 @@ int test_strisdigit_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -51,6 +55,7 @@ int test_strisdigit_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -62,6 +67,7 @@ int test_strisdigit_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,6 +79,7 @@ int test_strisdigit_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,6 +91,7 @@ int test_strisdigit_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -95,6 +103,7 @@ int test_strisdigit_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -106,9 +115,10 @@ int test_strisdigit_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strishex_s.c b/unittests/test_strishex_s.c
index 31f8b52..cc70ca0 100644
--- a/unittests/test_strishex_s.c
+++ b/unittests/test_strishex_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strishex_s()
+int test_strishex_s(void)
 {
     bool rc;
+    int errs = 0;
     uint32_t len;
     char   str[LEN];
 
@@ -24,6 +25,7 @@ int test_strishex_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -33,6 +35,7 @@ int test_strishex_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,6 +45,7 @@ int test_strishex_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -51,6 +55,7 @@ int test_strishex_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -60,6 +65,7 @@ int test_strishex_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -71,6 +77,7 @@ int test_strishex_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -82,6 +89,7 @@ int test_strishex_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -93,6 +101,7 @@ int test_strishex_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -104,6 +113,7 @@ int test_strishex_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -115,6 +125,7 @@ int test_strishex_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -127,9 +138,10 @@ int test_strishex_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strislowercase_s.c b/unittests/test_strislowercase_s.c
index 3960a5b..4f63870 100644
--- a/unittests/test_strislowercase_s.c
+++ b/unittests/test_strislowercase_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strislowercase_s()
+int test_strislowercase_s(void)
 {
     bool rc;
+    int errs = 0;
     uint32_t len;
     char   str[LEN];
 
@@ -24,6 +25,7 @@ int test_strislowercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -33,6 +35,7 @@ int test_strislowercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,6 +45,7 @@ int test_strislowercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -51,6 +55,7 @@ int test_strislowercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -62,6 +67,7 @@ int test_strislowercase_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,6 +79,7 @@ int test_strislowercase_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,6 +91,7 @@ int test_strislowercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -95,9 +103,10 @@ int test_strislowercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strismixed_s.c b/unittests/test_strismixed_s.c
index f067239..b421abe 100644
--- a/unittests/test_strismixed_s.c
+++ b/unittests/test_strismixed_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strismixed_s()
+int test_strismixed_s(void)
 {
     bool rc;
+    int errs = 0;
     rsize_t len;
     char   str[LEN];
 
@@ -24,6 +25,7 @@ int test_strismixed_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -33,6 +35,7 @@ int test_strismixed_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,6 +45,7 @@ int test_strismixed_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -51,6 +55,7 @@ int test_strismixed_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -62,6 +67,7 @@ int test_strismixed_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,6 +79,7 @@ int test_strismixed_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,6 +91,7 @@ int test_strismixed_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -95,6 +103,7 @@ int test_strismixed_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -106,9 +115,10 @@ int test_strismixed_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strispassword_s.c b/unittests/test_strispassword_s.c
index 6a54410..25e1e21 100644
--- a/unittests/test_strispassword_s.c
+++ b/unittests/test_strispassword_s.c
@@ -11,9 +11,10 @@
 #define LEN 64
 
 
-int test_strispassword_s()
+int test_strispassword_s(void)
 {
     bool rc;
+    int errs = 0;
     uint32_t len;
     char   str[LEN];
 
@@ -23,6 +24,7 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -31,6 +33,7 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -39,6 +42,7 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -47,6 +51,7 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -55,6 +60,7 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -66,6 +72,7 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -77,6 +84,7 @@ int test_strispassword_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -88,6 +96,7 @@ int test_strispassword_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -99,6 +108,7 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -110,6 +120,7 @@ int test_strispassword_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -121,9 +132,10 @@ int test_strispassword_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strisuppercase_s.c b/unittests/test_strisuppercase_s.c
index 9064d52..daae98c 100644
--- a/unittests/test_strisuppercase_s.c
+++ b/unittests/test_strisuppercase_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strisuppercase_s()
+int test_strisuppercase_s(void)
 {
     bool rc;
+    int errs = 0;
     uint32_t len;
     char   str[LEN];
 
@@ -24,6 +25,7 @@ int test_strisuppercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -33,6 +35,7 @@ int test_strisuppercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,6 +45,7 @@ int test_strisuppercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -51,6 +55,7 @@ int test_strisuppercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -62,6 +67,7 @@ int test_strisuppercase_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,6 +79,7 @@ int test_strisuppercase_s()
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,6 +91,7 @@ int test_strisuppercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -95,6 +103,7 @@ int test_strisuppercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -106,9 +115,10 @@ int test_strisuppercase_s()
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strlastchar_s.c b/unittests/test_strlastchar_s.c
index 31543bf..4c4fe96 100644
--- a/unittests/test_strlastchar_s.c
+++ b/unittests/test_strlastchar_s.c
@@ -12,9 +12,10 @@
 #define SHORT_LEN  ( 5 )
 
 
-int test_strlastchar_s()
+int test_strlastchar_s(void)
 {
     errno_t rc;
+    int errs = 0;
 
     char *last;
     char  str1[LEN];
@@ -25,11 +26,13 @@ int test_strlastchar_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
     if (last) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -38,6 +41,7 @@ int test_strlastchar_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -46,11 +50,13 @@ int test_strlastchar_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
     if (last) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -59,11 +65,13 @@ int test_strlastchar_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
     if (last) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -74,11 +82,13 @@ int test_strlastchar_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
     if (last) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,11 +99,13 @@ int test_strlastchar_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
     if (last) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -104,11 +116,13 @@ int test_strlastchar_s()
     if (rc != EOK) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
     if (last != &str1[15]) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -119,11 +133,13 @@ int test_strlastchar_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (last != &str1[0]) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -134,11 +150,13 @@ int test_strlastchar_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (last != &str1[2]) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -149,15 +167,17 @@ int test_strlastchar_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (last != &str1[8]) {
         printf("%s %u  Error  str1=%p  last=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  str1, last, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strlastdiff_s.c b/unittests/test_strlastdiff_s.c
index 2310e75..355a189 100644
--- a/unittests/test_strlastdiff_s.c
+++ b/unittests/test_strlastdiff_s.c
@@ -12,9 +12,10 @@
 #define SHORT_LEN  ( 5 )
 
 
-int test_strlastdiff_s()
+int test_strlastdiff_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t ind;
 
     char   str1[LEN];
@@ -27,11 +28,13 @@ int test_strlastdiff_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -40,11 +43,13 @@ int test_strlastdiff_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -53,6 +58,7 @@ int test_strlastdiff_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -61,11 +67,13 @@ int test_strlastdiff_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -74,11 +82,13 @@ int test_strlastdiff_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -90,11 +100,13 @@ int test_strlastdiff_s()
     if (rc != ESNODIFF) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -106,11 +118,13 @@ int test_strlastdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 6) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -122,11 +136,13 @@ int test_strlastdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 1) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -138,11 +154,13 @@ int test_strlastdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 10) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -153,11 +171,13 @@ int test_strlastdiff_s()
     if (rc != ESNODIFF) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -169,11 +189,13 @@ int test_strlastdiff_s()
     if (rc != ESNODIFF) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -185,14 +207,16 @@ int test_strlastdiff_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 13) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strlastsame_s.c b/unittests/test_strlastsame_s.c
index d81fe52..e69d8f1 100644
--- a/unittests/test_strlastsame_s.c
+++ b/unittests/test_strlastsame_s.c
@@ -12,9 +12,10 @@
 #define SHORT_LEN  ( 5 )
 
 
-int test_strlastsame_s()
+int test_strlastsame_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t ind;
 
     char   str1[LEN];
@@ -26,11 +27,13 @@ int test_strlastsame_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -39,11 +42,13 @@ int test_strlastsame_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -52,6 +57,7 @@ int test_strlastsame_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -60,11 +66,13 @@ int test_strlastsame_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -73,11 +81,13 @@ int test_strlastsame_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,11 +99,13 @@ int test_strlastsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error  ind=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -105,11 +117,13 @@ int test_strlastsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 3) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -121,11 +135,13 @@ int test_strlastsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -137,11 +153,13 @@ int test_strlastsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 1) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -153,11 +171,13 @@ int test_strlastsame_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (ind != 13) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -169,11 +189,13 @@ int test_strlastsame_s()
     if (rc != EOK) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 13) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -185,11 +207,13 @@ int test_strlastsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -201,11 +225,13 @@ int test_strlastsame_s()
     if (rc != EOK) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -217,11 +243,13 @@ int test_strlastsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -233,14 +261,16 @@ int test_strlastsame_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Error ind=%zu  rc=%d \n",
                      __FUNCTION__, __LINE__,  ind, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strljustify_s.c b/unittests/test_strljustify_s.c
index d8a6b51..e456c0d 100644
--- a/unittests/test_strljustify_s.c
+++ b/unittests/test_strljustify_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strljustify_s()
+int test_strljustify_s(void)
 {
     errno_t rc;
+    int errs = 0;
     int ind;
     uint32_t len;
     char   str[LEN];
@@ -25,6 +26,7 @@ int test_strljustify_s()
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -34,6 +36,7 @@ int test_strljustify_s()
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -43,6 +46,7 @@ int test_strljustify_s()
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -52,6 +56,7 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
@@ -66,11 +71,13 @@ int test_strljustify_s()
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != '\0') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,11 +91,13 @@ int test_strljustify_s()
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != '\0') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -102,11 +111,13 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != '\0') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -120,11 +131,13 @@ int test_strljustify_s()
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != '\0') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -138,12 +151,14 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "ABC");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -156,12 +171,14 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "B ");
     if (ind != 0) {
         printf("%s %u   Error -%s-  ind=%d \n",
                      __FUNCTION__, __LINE__,  str, ind);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -174,12 +191,14 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "B ");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -192,12 +211,14 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "C ");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -210,12 +231,14 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "NowISTHETimE       ");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -228,6 +251,7 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -240,9 +264,10 @@ int test_strljustify_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strncat_s.c b/unittests/test_strncat_s.c
index 5bedd39..2c5166a 100644
--- a/unittests/test_strncat_s.c
+++ b/unittests/test_strncat_s.c
@@ -16,46 +16,52 @@ static char   str2[LEN];
 int test_strncat_s (void)
 {
     errno_t rc;
+    int errs = 0;
     int32_t ind;
 
 /*--------------------------------------------------*/
 
     rc = strncat_s(NULL, LEN, str2, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strncat_s(str1, LEN, NULL, LEN);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strncat_s(str1, 0, str2, LEN);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strncat_s(str1, (RSIZE_MAX_STR+1), str2, LEN);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strncat_s(str1, (RSIZE_MAX_STR), str2, (RSIZE_MAX_STR+1));
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -65,13 +71,15 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 1, str2, LEN);
     if (rc != ESUNTERM) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -81,13 +89,15 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 2, str2, LEN);
     if (rc != ESUNTERM) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -97,13 +107,15 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 2, str2, 1);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -113,14 +125,16 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 3, str2, 1);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, "ab");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -130,14 +144,16 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 50, str2, LEN);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, "aaaaaaaaaakeep it simple");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -149,14 +165,16 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 100, str2, 100);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, "goodbye");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -166,14 +184,16 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 6, "", 1);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, "hello");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -183,13 +203,15 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 6, "X", 2);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
-        debug_printf("%s %u  Expected null  \n",
-                     __FUNCTION__, __LINE__);
+        printf("%s %u  Expected null  \n",
+               __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -199,19 +221,21 @@ int test_strncat_s (void)
 
     rc = strncat_s(str1, 7, "defghijklmn", 3);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc);
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     ind = strcmp(str1, "abcdef");
     if (ind != 0) {
-        debug_printf("%s %u   Error -%s- \n",
-                     __FUNCTION__, __LINE__,  str1);
+        printf("%s %u   Error -%s- \n",
+               __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_strncpy_s.c b/unittests/test_strncpy_s.c
index ba56fd1..40d7fd4 100644
--- a/unittests/test_strncpy_s.c
+++ b/unittests/test_strncpy_s.c
@@ -18,6 +18,7 @@ static char   dest[LEN];
 int test_strncpy_s (void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t nlen;
     int32_t ind;
 
@@ -26,8 +27,9 @@ int test_strncpy_s (void)
     nlen = 5;
     rc = strncpy_s(NULL, LEN, str2, nlen);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -37,13 +39,15 @@ int test_strncpy_s (void)
     nlen = 5;
     rc = strncpy_s(str1, 5, NULL, nlen);
     if (rc != ESNULLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
         if (str1[0] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
 
 /*--------------------------------------------------*/
@@ -51,16 +55,18 @@ int test_strncpy_s (void)
     nlen = 5;
     rc = strncpy_s(str1, 0, str2, nlen);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
     rc = strncpy_s(str1, (RSIZE_MAX_STR+1), str2, nlen);
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -71,13 +77,15 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(str1, 5, str2, 0);
     if (rc != ESZEROL) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
         if (str1[0] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
 
 /*--------------------------------------------------*/
@@ -88,8 +96,9 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(str1, 5, str2, (RSIZE_MAX_STR+1));
     if (rc != ESLEMAX) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -101,13 +110,15 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(&str1[0], LEN/2, &str2[0], nlen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
         if (str1[0] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
 
 /*--------------------------------------------------*/
@@ -118,13 +129,15 @@ int test_strncpy_s (void)
     /* test overlap */
     rc = strncpy_s(str1, LEN, str1, nlen);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
         if (str1[0] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
 
 /*--------------------------------------------------*/
@@ -134,13 +147,15 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(&str1[0], LEN, &str1[5], nlen);
     if (rc != ESOVRLP) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
         if (str1[0] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
 
 /*--------------------------------------------------*/
@@ -151,13 +166,15 @@ int test_strncpy_s (void)
     nlen = 10;
     rc = strncpy_s(str1, LEN, str2, nlen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
         if (str1[0] != '\0') {
-            debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+            printf("%s %u   Error rc=%u \n",
+                   __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
 
 /*--------------------------------------------------*/
@@ -168,15 +185,17 @@ int test_strncpy_s (void)
     nlen = 20;
     rc = strncpy_s(str1, LEN, str2, nlen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 
@@ -188,15 +207,17 @@ int test_strncpy_s (void)
     nlen = 32;
     rc = strncpy_s(str1, LEN, str2, nlen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -207,13 +228,15 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(str1, 1, str2, nlen);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -223,13 +246,15 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(str1, 2, str2, nlen);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != '\0') {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -240,15 +265,17 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(dest, 6, str1, 100);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(dest, str1);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -259,8 +286,9 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(dest, 5, str2, 7);
     if (rc != ESNOSPC) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -271,15 +299,17 @@ int test_strncpy_s (void)
 
     rc = strncpy_s(dest, 5, str2, 4);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(dest, "good");
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -290,15 +320,17 @@ int test_strncpy_s (void)
     /*   strnlen("good") < 5   */
     rc = strncpy_s(dest, 5, str2, 8);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(dest, "good");
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -309,20 +341,22 @@ int test_strncpy_s (void)
     nlen = 10;
     rc = strncpy_s(str1, 10, str2, nlen);
     if (rc != EOK) {
-        debug_printf("%s %u   Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  rc );
+        printf("%s %u   Error rc=%u \n",
+               __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     /* be sure the results are the same as strcmp */
     ind = strcmp(str1, str2);
     if (ind != 0) {
-        debug_printf("%s %u -%s-  Error rc=%u \n",
-                     __FUNCTION__, __LINE__,  str1, rc );
+        printf("%s %u -%s-  Error rc=%u \n",
+               __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_strnlen_s.c b/unittests/test_strnlen_s.c
index d0f507a..3703757 100644
--- a/unittests/test_strnlen_s.c
+++ b/unittests/test_strnlen_s.c
@@ -13,6 +13,7 @@
 int test_strnlen_s (void)
 {
     rsize_t len;
+    int errs = 0;
     rsize_t std_len;
     rsize_t max_len;
 
@@ -23,6 +24,7 @@ int test_strnlen_s (void)
     if (len != 0) {
         printf("%s %u   Len=%zu \n",
                      __FUNCTION__, __LINE__,  len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -32,6 +34,7 @@ int test_strnlen_s (void)
     if (len != 0) {
         printf("%s %u   Len=%zu \n",
                      __FUNCTION__, __LINE__,  len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -41,6 +44,7 @@ int test_strnlen_s (void)
     if (len != 0) {
         printf("%s %u   Len=%zu \n",
                      __FUNCTION__, __LINE__,  len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -53,6 +57,7 @@ int test_strnlen_s (void)
     if (std_len != len) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -65,6 +70,7 @@ int test_strnlen_s (void)
     if (std_len != len) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -77,6 +83,7 @@ int test_strnlen_s (void)
     if (std_len != len) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,6 +96,7 @@ int test_strnlen_s (void)
     if (std_len != len) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -99,6 +107,7 @@ int test_strnlen_s (void)
     if (len != max_len) {
         printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -109,6 +118,7 @@ int test_strnlen_s (void)
     if (len != max_len) {
         printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -119,11 +129,12 @@ int test_strnlen_s (void)
     if (len != max_len) {
         printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_strnterminate_s.c b/unittests/test_strnterminate_s.c
index 004b47d..9ae6299 100644
--- a/unittests/test_strnterminate_s.c
+++ b/unittests/test_strnterminate_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strnterminate_s()
+int test_strnterminate_s(void)
 {
     rsize_t len;
+    int errs = 0;
     rsize_t std_len;
     rsize_t max_len;
     char  dest[LEN];
@@ -27,6 +28,7 @@ int test_strnterminate_s()
     if (len != 0) {
         printf("%s %u   Len=%zu \n",
                      __FUNCTION__, __LINE__,  len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -37,6 +39,7 @@ int test_strnterminate_s()
     if (len != 0) {
         printf("%s %u   Len=%zu \n",
                      __FUNCTION__, __LINE__,  len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -47,6 +50,7 @@ int test_strnterminate_s()
     if (len != 0) {
         printf("%s %u   Len=%zu \n",
                      __FUNCTION__, __LINE__,  len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -60,6 +64,7 @@ int test_strnterminate_s()
     if (std_len != len) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -70,6 +75,7 @@ int test_strnterminate_s()
     if (len != 0 ) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -81,6 +87,7 @@ int test_strnterminate_s()
     if (len != 1 ) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -92,6 +99,7 @@ int test_strnterminate_s()
     if (len != 1 ) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -103,6 +111,7 @@ int test_strnterminate_s()
     if (len != 2) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -114,6 +123,7 @@ int test_strnterminate_s()
     if (len != 4) {
         printf("%s %u   std_len=%zu  len=%zu  \n",
                      __FUNCTION__, __LINE__,  std_len, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -125,6 +135,7 @@ int test_strnterminate_s()
     if (len != 0) {
         printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -136,6 +147,7 @@ int test_strnterminate_s()
     if (len != max_len-1) {
         printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -147,6 +159,7 @@ int test_strnterminate_s()
     if (len != max_len-1) {
         printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -158,6 +171,7 @@ int test_strnterminate_s()
     if (len != strlen(dest)) {
         printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -171,6 +185,7 @@ int test_strnterminate_s()
         if (len != strlen(dest)) {
             printf("%s %u   len=%zu  \n",
                      __FUNCTION__, __LINE__, len);
+	    ++errs;
         }
     }
 
@@ -178,5 +193,5 @@ int test_strnterminate_s()
 
 
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strpbrk_s.c b/unittests/test_strpbrk_s.c
index ff80c1e..d6fda48 100644
--- a/unittests/test_strpbrk_s.c
+++ b/unittests/test_strpbrk_s.c
@@ -17,6 +17,7 @@ static char   str2[LEN];
 int test_strpbrk_s (void)
 {
     errno_t rc;
+    int errs = 0;
     char *first;
     char *std_first;
 
@@ -26,6 +27,7 @@ int test_strpbrk_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -34,11 +36,13 @@ int test_strpbrk_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -47,11 +51,13 @@ int test_strpbrk_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -60,6 +66,7 @@ int test_strpbrk_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -68,11 +75,13 @@ int test_strpbrk_s (void)
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -81,11 +90,13 @@ int test_strpbrk_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -94,11 +105,13 @@ int test_strpbrk_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -111,17 +124,20 @@ int test_strpbrk_s (void)
     if (rc != ESNOTFND) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
     if (first) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -133,12 +149,14 @@ int test_strpbrk_s (void)
     if (rc != ESNOTFND) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -150,12 +168,14 @@ int test_strpbrk_s (void)
     if (rc != EOK) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -167,12 +187,14 @@ int test_strpbrk_s (void)
     if (rc != EOK) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -184,11 +206,13 @@ int test_strpbrk_s (void)
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first != 0) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -200,11 +224,13 @@ int test_strpbrk_s (void)
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (first != 0) {
         printf("%s %u  Error  first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__, first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -216,12 +242,14 @@ int test_strpbrk_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -233,12 +261,14 @@ int test_strpbrk_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -250,12 +280,14 @@ int test_strpbrk_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -267,15 +299,17 @@ int test_strpbrk_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_first = strpbrk(str1, str2);
     if (first != std_first) {
         printf("%s %u  first=%p  std_first=%p  rc=%d \n",
                      __FUNCTION__, __LINE__,  first, std_first, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strprefix_s.c b/unittests/test_strprefix_s.c
index 268f96b..bf0841c 100644
--- a/unittests/test_strprefix_s.c
+++ b/unittests/test_strprefix_s.c
@@ -12,9 +12,10 @@
 #define SHORT_LEN  ( 5 )
 
 
-int test_strprefix_s()
+int test_strprefix_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t len;
 
     char   str1[LEN];
@@ -26,6 +27,7 @@ int test_strprefix_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -34,6 +36,7 @@ int test_strprefix_s()
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,6 +45,7 @@ int test_strprefix_s()
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -50,6 +54,7 @@ int test_strprefix_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -61,6 +66,7 @@ int test_strprefix_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -72,6 +78,7 @@ int test_strprefix_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -83,6 +90,7 @@ int test_strprefix_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -94,6 +102,7 @@ int test_strprefix_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -105,6 +114,7 @@ int test_strprefix_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -116,6 +126,7 @@ int test_strprefix_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -126,6 +137,7 @@ int test_strprefix_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -139,6 +151,7 @@ int test_strprefix_s()
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -152,9 +165,10 @@ int test_strprefix_s()
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strremovews_s.c b/unittests/test_strremovews_s.c
index 3c80bca..bef038b 100644
--- a/unittests/test_strremovews_s.c
+++ b/unittests/test_strremovews_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strremovews_s()
+int test_strremovews_s(void)
 {
     errno_t rc;
+    int errs = 0;
     int ind;
 
     uint32_t len;
@@ -26,6 +27,7 @@ int test_strremovews_s()
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -35,6 +37,7 @@ int test_strremovews_s()
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -44,6 +47,7 @@ int test_strremovews_s()
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -55,11 +59,13 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != '\0') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -72,6 +78,7 @@ int test_strremovews_s()
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u --%s--\n",
                      __FUNCTION__, __LINE__,  rc, str );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,11 +91,13 @@ int test_strremovews_s()
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u --%s--\n",
                      __FUNCTION__, __LINE__,  rc, str );
+        ++errs;
     }
 
     if (str[0] != '\0') {
         printf("%s %u   Error rc=%u --%s--\n",
                      __FUNCTION__, __LINE__,  rc, str );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -101,6 +110,7 @@ int test_strremovews_s()
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u --%s--\n",
                      __FUNCTION__, __LINE__,  rc, str );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -114,11 +124,13 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != '\0') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -131,11 +143,13 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != 'A') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -148,11 +162,13 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (str[0] != 'B') {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -165,12 +181,14 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "C");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -183,12 +201,14 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "NowISTHETimE 1 2");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -201,12 +221,14 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "q q21ego");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -219,15 +241,17 @@ int test_strremovews_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     ind = strcmp(str, "1 2 3 4");
     if (ind != 0) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strspn_s.c b/unittests/test_strspn_s.c
index 8529d2f..2bef05c 100644
--- a/unittests/test_strspn_s.c
+++ b/unittests/test_strspn_s.c
@@ -17,6 +17,7 @@ static char   str2[LEN];
 int test_strspn_s (void)
 {
     errno_t rc = 0;
+    int errs = 0;
     rsize_t count = 0;
     int32_t std_count = 0;
 
@@ -27,11 +28,13 @@ int test_strspn_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -40,11 +43,13 @@ int test_strspn_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -53,6 +58,7 @@ int test_strspn_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -61,11 +67,13 @@ int test_strspn_s (void)
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -74,11 +82,13 @@ int test_strspn_s (void)
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -87,11 +97,13 @@ int test_strspn_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -100,11 +112,13 @@ int test_strspn_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -116,11 +130,13 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 0) {
         printf("%s %u  Error  count=%zu rc=%d \n",
                      __FUNCTION__, __LINE__, count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -132,11 +148,13 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 1) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -148,11 +166,13 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 2) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -164,11 +184,13 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (count != 3) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -180,12 +202,14 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -197,12 +221,14 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 
@@ -215,12 +241,14 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -232,12 +260,14 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -249,12 +279,14 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -266,16 +298,18 @@ int test_strspn_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     std_count = strspn(str1, str2);
     if (count != std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_strstr_s.c b/unittests/test_strstr_s.c
index 8955774..7405748 100644
--- a/unittests/test_strstr_s.c
+++ b/unittests/test_strstr_s.c
@@ -17,6 +17,7 @@ static char   str2[LEN];
 int test_strstr_s (void)
 {
     errno_t rc;
+    int errs = 0;
     char *sub;
     char *std_sub;
 
@@ -29,11 +30,13 @@ int test_strstr_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,11 +45,13 @@ int test_strstr_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -55,6 +60,7 @@ int test_strstr_s (void)
     if (rc != ESNULLP) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -63,11 +69,13 @@ int test_strstr_s (void)
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -76,11 +84,13 @@ int test_strstr_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -89,11 +99,13 @@ int test_strstr_s (void)
     if (rc != ESZEROL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -102,11 +114,13 @@ int test_strstr_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -118,11 +132,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != str1) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -134,11 +150,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != str1) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -151,11 +169,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[0]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -168,11 +188,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[1]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -185,11 +207,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[15]) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -204,11 +228,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[17]) {
         printf("%s %u  Error rc=%d  sub=%s \n",
                      __FUNCTION__, __LINE__, rc, sub);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -223,11 +249,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[18]) {
         printf("%s %u  Error rc=%d  sub=%s \n",
                      __FUNCTION__, __LINE__, rc, sub);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -239,6 +267,7 @@ int test_strstr_s (void)
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -250,6 +279,7 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -261,6 +291,7 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -274,11 +305,13 @@ int test_strstr_s (void)
     if (rc != ESNOTFND) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != NULL) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -290,6 +323,7 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%d \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -301,11 +335,13 @@ int test_strstr_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if (sub != &str1[1]) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     /* compare to legacy */
@@ -313,9 +349,10 @@ int test_strstr_s (void)
     if (sub != std_sub) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strtok_s.c b/unittests/test_strtok_s.c
index e1fbf4b..4a80cf0 100644
--- a/unittests/test_strtok_s.c
+++ b/unittests/test_strtok_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strtok_s()
+int test_strtok_s(void)
 {
     errno_t rc;
+    int errs = 0;
     char *p2str;
     char *p2tok;
 
@@ -29,6 +30,7 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -39,6 +41,7 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -49,6 +52,7 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -59,6 +63,7 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -68,6 +73,7 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -83,6 +89,7 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u token -%s-  remaining -%s-  \n",
                      __FUNCTION__, __LINE__,  p2tok, p2str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -97,10 +104,12 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u token -%s-  remaining -%s-  \n",
                      __FUNCTION__, __LINE__,  p2tok, p2str);
+        ++errs;
     }
 
     if (p2tok != NULL) {
         printf("token -%s-  -%s- \n", p2tok, p2str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -115,6 +124,7 @@ int test_strtok_s()
     if (p2tok == NULL) {
         printf("%s %u token -%s-  remaining -%s-  \n",
                      __FUNCTION__, __LINE__,  "", p2str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -130,11 +140,13 @@ int test_strtok_s()
     if (p2tok == NULL) {
         printf("%s %u token -%s-  remaining -%s-  \n",
                      __FUNCTION__, __LINE__,  "", p2str);
+        ++errs;
     }
 
     if (strcmp(p2tok, "mnopqrst")) {
         printf("%s %u token -%s-  remaining -%s-  \n",
                      __FUNCTION__, __LINE__,  p2tok, p2str);
+        ++errs;
     }
 
     //printf("token -%s-  -%s- len=%d \n", p2tok, p2str, (int)len );
@@ -146,6 +158,7 @@ int test_strtok_s()
     if (p2tok != NULL) {
         printf("%s %u token -%s-  remaining -%s-  \n",
                      __FUNCTION__, __LINE__,  p2tok, p2str);
+        ++errs;
     }
 
     //printf("token -%s-  -%s- len=%d \n", p2tok, p2str, (int)len );
@@ -165,6 +178,7 @@ int test_strtok_s()
     if (strcmp(p2tok, "a") ) {
         printf("%s %u token -%s-  -%s- len=%d \n",
                __FUNCTION__, __LINE__, p2tok, p2str, (int)len );
+        ++errs;
     }
 
     //printf("token -%s-  -%s- len=%d \n", p2tok, p2str, (int)len );
@@ -182,6 +196,7 @@ int test_strtok_s()
     if (strcmp(p2tok, "??b") ) {
         printf("%s %u token -%s-  -%s- len=%d \n",
                __FUNCTION__, __LINE__, p2tok, p2str, (int)len );
+        ++errs;
     }
 
     //printf("token -%s-  -%s- len=%d \n", p2tok, p2str, (int)len );
@@ -324,5 +339,5 @@ int test_strtok_s()
 */
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strtolowercase_s.c b/unittests/test_strtolowercase_s.c
index 31cf6e5..679fcb7 100644
--- a/unittests/test_strtolowercase_s.c
+++ b/unittests/test_strtolowercase_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strtolowercase_s()
+int test_strtolowercase_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t len;
     char str[LEN];
 
@@ -24,6 +25,7 @@ int test_strtolowercase_s()
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -33,6 +35,7 @@ int test_strtolowercase_s()
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -42,6 +45,7 @@ int test_strtolowercase_s()
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -53,11 +57,13 @@ int test_strtolowercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (strcmp(str, "n") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -69,11 +75,13 @@ int test_strtolowercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (strcmp(str, "n") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -84,11 +92,13 @@ int test_strtolowercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (strcmp(str, "nowisthetim3") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -100,11 +110,13 @@ int test_strtolowercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (strcmp(str, "nowisthetime") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -116,11 +128,13 @@ int test_strtolowercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (strcmp(str, "qqero") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -132,10 +146,11 @@ int test_strtolowercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_strtouppercase_s.c b/unittests/test_strtouppercase_s.c
index 25d4d8d..00b33bf 100644
--- a/unittests/test_strtouppercase_s.c
+++ b/unittests/test_strtouppercase_s.c
@@ -11,9 +11,10 @@
 #define LEN   ( 128 )
 
 
-int test_strtouppercase_s()
+int test_strtouppercase_s(void)
 {
     errno_t rc;
+    int errs = 0;
     rsize_t len;
     char str[LEN];
 
@@ -25,6 +26,7 @@ int test_strtouppercase_s()
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -35,6 +37,7 @@ int test_strtouppercase_s()
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -46,6 +49,7 @@ int test_strtouppercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -58,6 +62,7 @@ int test_strtouppercase_s()
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -70,12 +75,14 @@ int test_strtouppercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 	//printf("debug - 06\n");
 
     if (strcmp(str, "N") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -88,12 +95,14 @@ int test_strtouppercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 	//printf("debug - 08\n");
     if (strcmp(str, "N") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -106,12 +115,14 @@ int test_strtouppercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 	//printf("debug - 10\n");
     if (strcmp(str, "NOWISTHETIME") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -124,12 +135,14 @@ int test_strtouppercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 	//printf("debug - 12\n");
     if (strcmp(str, "QQERO") ) {
         printf("%s %u   Error -%s- \n",
                      __FUNCTION__, __LINE__,  str);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -142,9 +155,10 @@ int test_strtouppercase_s()
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_wcpcpy_s.c b/unittests/test_wcpcpy_s.c
index 317c8f8..2519f9e 100644
--- a/unittests/test_wcpcpy_s.c
+++ b/unittests/test_wcpcpy_s.c
@@ -86,6 +86,7 @@ int test_wcpcpy_s (void)
 {
     wchar_t *ret;
     errno_t rc;
+    int errs = 0;
 #ifdef SAFE_LIB_STR_NULL_SLACK
     uint32_t i;
 #endif /*SAFE_LIB_STR_NULL_SLACK*/
@@ -103,11 +104,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -118,10 +121,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
@@ -133,10 +138,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -149,11 +156,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -161,12 +170,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -181,11 +192,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
@@ -199,11 +212,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != L'\0' || ret != str1+wcsnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -220,10 +235,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -231,12 +248,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -254,10 +273,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -265,12 +286,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[5] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -293,10 +316,12 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != L'\0' || ret != str1) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -304,12 +329,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error - string should be NULL rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -326,16 +353,19 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != L'\0' || ret != str2+wcsnlen_s(str2,LEN)) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"keep it simple", (15)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 
@@ -352,17 +382,20 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, (wcsnlen_s(str2, LEN))*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls- <> -%ls-  (smax=%lu) Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, str2, sz, rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != L'\0' || ret != str1+wcsnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -376,22 +409,26 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret == NULL || ret[0] != L'\0' || ret != str1+wcsnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     sz = wcsnlen_s(str1, LEN);
     if (sz != 5) {
             printf("%s %u (sz=%lu <> 5) Error rc=%u \n",
                          __FUNCTION__, __LINE__,  sz, rc );
+            ++errs;
     }
     rc = memcmp_s(str1, LEN, str2, (6)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, str2, sz, rc );
+        ++errs;
     }
 
 
@@ -407,15 +444,18 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != L'\0') {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -430,15 +470,18 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str2 != L'\0') {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -452,16 +495,19 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, (3)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != L'\0' || ret != str2+wcsnlen_s(str2, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -475,16 +521,19 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
     if (ret == NULL || ret[0] != L'\0' || ret != str1+wcsnlen_s(str1, LEN) ) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, (3)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 
@@ -500,19 +549,22 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (ret != NULL) {
         printf("Returned pointer incorrect: %s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str2 != L'\0') {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_wcscat_s.c b/unittests/test_wcscat_s.c
index 689af75..e05bb22 100644
--- a/unittests/test_wcscat_s.c
+++ b/unittests/test_wcscat_s.c
@@ -44,6 +44,7 @@ extern errno_t wcscat_s(wchar_t* dest, rsize_t dmax, const wchar_t* src);
 int test_wcscat_s (void)
 {
     errno_t rc;
+    int errs = 0;
     int32_t  ind;
     int32_t  len1;
     int32_t  len2;
@@ -60,6 +61,7 @@ int test_wcscat_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -70,6 +72,7 @@ int test_wcscat_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -80,6 +83,7 @@ int test_wcscat_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -90,6 +94,7 @@ int test_wcscat_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -103,11 +108,13 @@ int test_wcscat_s (void)
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
 	if (str1[0] != L'\0') {
 		printf("%s %u  Expected null  \n",
 					 __FUNCTION__, __LINE__);
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -121,11 +128,13 @@ int test_wcscat_s (void)
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -139,11 +148,13 @@ int test_wcscat_s (void)
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -157,11 +168,13 @@ int test_wcscat_s (void)
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
 	if (str1[0] != L'\0') {
 		printf("%s %u  Expected null  \n",
 					 __FUNCTION__, __LINE__);
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -178,12 +191,14 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     len3 = wcsnlen_s(str1, LEN);
     if (len3 != (len1+len2)) {
         printf("%s %u lengths wrong: %u  %u  %u \n",
                      __FUNCTION__, __LINE__, len1, len2, len3);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -198,11 +213,13 @@ int test_wcscat_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -216,11 +233,13 @@ int test_wcscat_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -234,12 +253,14 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, wcsnlen_s(str2, LEN)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -254,11 +275,13 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -272,12 +295,14 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"keep it simple", (15)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -291,12 +316,14 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, L"qqweqqkeep it simple", (20)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -310,6 +337,7 @@ int test_wcscat_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -323,12 +351,14 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"keep it simple1234", (19)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 
@@ -343,11 +373,13 @@ int test_wcscat_s (void)
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[13] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -361,12 +393,14 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"123keep it simple", (17)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -380,6 +414,7 @@ int test_wcscat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"123456789", (9)*sizeof(wchar_t), &ind );
@@ -387,6 +422,7 @@ int test_wcscat_s (void)
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -400,17 +436,19 @@ int test_wcscat_s (void)
 	if (rc != ESNOSPC) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
     if (str2[0] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_wcscpy_s.c b/unittests/test_wcscpy_s.c
index 294c168..90a627b 100644
--- a/unittests/test_wcscpy_s.c
+++ b/unittests/test_wcscpy_s.c
@@ -84,6 +84,7 @@ extern errno_t wcscpy_s(wchar_t* dest, rsize_t dmax, const wchar_t* src);
 int test_wcscpy_s (void)
 {
     errno_t rc;
+    int errs = 0;
 #ifdef SAFE_LIB_STR_NULL_SLACK
     uint32_t i;
 #endif /*SAFE_LIB_STR_NULL_SLACK*/
@@ -102,6 +103,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -112,6 +114,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESZEROL) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -122,6 +125,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESLEMAX) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -134,6 +138,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -141,12 +146,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -161,6 +168,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -173,6 +181,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -188,6 +197,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -195,12 +205,14 @@ printf("Test #%d:\n", ++testno);
 		if (str1[i] != L'\0') {
 			printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+			++errs;
 		}
 	}
 #else
 	if (str1[0] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #endif
 
@@ -218,6 +230,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -225,12 +238,14 @@ printf("Test #%d:\n", ++testno);
 		if (str1[i] != L'\0') {
 			printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+			++errs;
 		}
 	}
 #else
 	if (str1[8] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #endif
 
@@ -248,6 +263,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -255,12 +271,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error - string should be NULL rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -277,12 +295,14 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, str1, (sz+1)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- <> -%ls-\n",
                      __FUNCTION__, __LINE__,  str2, str1);
+        ++errs;
     }
 
 
@@ -298,12 +318,14 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, (sz)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls- <> -%ls-  (smax=%lu) Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, str2, sz, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -318,17 +340,20 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     sz = wcsnlen_s(str1, LEN);
     if (sz != sz_orig && sz == 14) {
             printf("%s %u (sz=%lu <> 5) Error rc=%u \n",
                          __FUNCTION__, __LINE__,  sz, rc );
+            ++errs;
     }
     rc = memcmp_s(str1, LEN, str2, (sz)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, str2, sz, rc );
+        ++errs;
     }
 
 
@@ -344,11 +369,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str1 != L'\0') {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -362,11 +389,13 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     if (*str2 != L'\0') {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -381,12 +410,14 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, (3)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -402,12 +433,14 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, (3)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 
@@ -424,14 +457,16 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESNOSPC) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
     if (*str2 != L'\0') {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_wcsncat_s.c b/unittests/test_wcsncat_s.c
index 865ccf8..832a1d4 100644
--- a/unittests/test_wcsncat_s.c
+++ b/unittests/test_wcsncat_s.c
@@ -87,6 +87,7 @@ extern errno_t wcsncat_s (wchar_t *dest, rsize_t dmax, const wchar_t *src, rsize
 int test_wcsncat_s (void)
 {
     errno_t rc;
+    int errs = 0;
     int32_t  ind;
     int32_t  len1;
     int32_t  len2;
@@ -103,6 +104,7 @@ int test_wcsncat_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -113,6 +115,7 @@ int test_wcsncat_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -123,6 +126,7 @@ int test_wcsncat_s (void)
 	if (rc != ESLEMAX) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+	    ++errs;
 	}
 /*--------------------------------------------------*/
 /* 4   Test zero maximum length of destination */
@@ -132,6 +136,7 @@ int test_wcsncat_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -142,6 +147,7 @@ int test_wcsncat_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 
@@ -156,11 +162,13 @@ int test_wcsncat_s (void)
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -173,11 +181,13 @@ int test_wcsncat_s (void)
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -191,11 +201,13 @@ int test_wcsncat_s (void)
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
 	if (str1[0] != '\0') {
 		printf("%s %u  Expected null  \n",
 					 __FUNCTION__, __LINE__);
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -212,18 +224,21 @@ int test_wcsncat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     len3 = wcsnlen_s(str1, LEN);
     if (len3 != (len1+len2)) {
         printf("%s %u lengths wrong: %u  %u  %u \n",
                      __FUNCTION__, __LINE__, len1, len2, len3);
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, L"aaaaaaaaaakeep it si", (len3+1)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -240,18 +255,21 @@ int test_wcsncat_s (void)
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
 	len3 = wcsnlen_s(str1, LEN);
 	if (len3 != (len1+len2)) {
 		printf("%s %u lengths wrong: %u  %u  %u \n",
 					 __FUNCTION__, __LINE__, len1, len2, len3);
+		++errs;
 	}
 
     rc = memcmp_s(str1, LEN, L"aaaaaaaaaakeep it simple", (len3+1)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -266,11 +284,13 @@ int test_wcsncat_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -284,11 +304,13 @@ int test_wcsncat_s (void)
     if (rc != ESNOSPC) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -302,12 +324,14 @@ int test_wcsncat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, wcsnlen_s(str2, LEN)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -322,11 +346,13 @@ int test_wcsncat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str1[0] != '\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -340,12 +366,14 @@ int test_wcsncat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"keep it simple", (15)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -359,12 +387,14 @@ int test_wcsncat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"qqweqqkeep it simple", (20)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -378,11 +408,13 @@ int test_wcsncat_s (void)
     if (rc != ESUNTERM) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     if (str2[0] != '\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -396,11 +428,13 @@ int test_wcsncat_s (void)
 	if (rc != ESNOSPC) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
     if (str2[0] != '\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -413,11 +447,13 @@ int test_wcsncat_s (void)
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
 	if (str1[7] != '\0') {
 		printf("%s %u  Expected null  \n",
 					 __FUNCTION__, __LINE__);
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -431,12 +467,14 @@ int test_wcsncat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"keep it simple1234", (19)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -450,12 +488,14 @@ int test_wcsncat_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
     rc = memcmp_s(str2, LEN, L"123456789keep it", (17)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- \n",
                      __FUNCTION__, __LINE__,  str1);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -469,17 +509,19 @@ int test_wcsncat_s (void)
 	if (rc != ESNOSPC) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
     if (str2[0] != L'\0') {
         printf("%s %u  Expected null  \n",
                      __FUNCTION__, __LINE__);
+        ++errs;
     }
 
 
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
 
diff --git a/unittests/test_wcsncpy_s.c b/unittests/test_wcsncpy_s.c
index 009f47a..3a86ffa 100644
--- a/unittests/test_wcsncpy_s.c
+++ b/unittests/test_wcsncpy_s.c
@@ -84,6 +84,7 @@ extern errno_t wmemset_s (wchar_t *dest, wchar_t value, rsize_t len);
 int test_wcsncpy_s (void)
 {
     errno_t rc;
+    int errs = 0;
 #ifdef SAFE_LIB_STR_NULL_SLACK
     uint32_t i;
 #endif /*SAFE_LIB_STR_NULL_SLACK*/
@@ -102,6 +103,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -112,6 +114,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESZEROL) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -122,6 +125,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESLEMAX) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -134,6 +138,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 #ifdef SAFE_LIB_STR_NULL_SLACK
@@ -141,12 +146,14 @@ printf("Test #%d:\n", ++testno);
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -158,18 +165,21 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESZEROL) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+	    ++errs;
 	}
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<LEN; i++) {
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -181,18 +191,21 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESLEMAX) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<LEN; i++) {
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -206,18 +219,21 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<5; i++) {
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -231,18 +247,21 @@ printf("Test #%d:\n", ++testno);
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<5; i++) {
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	    ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -258,17 +277,20 @@ printf("Test #%d:\n", ++testno);
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	if (str1[9] == L'\0' && str2[10] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
     rc = memcmp_s(str1, LEN, str2, (10)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u   Error -%ls- <> -%ls-\n",
                      __FUNCTION__, __LINE__,  str1, str2);
+        ++errs;
     }
 
 
@@ -284,17 +306,20 @@ printf("Test #%d:\n", ++testno);
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	if (str1[sz] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	rc = memcmp_s(str1, LEN, str2, (sz+1)*sizeof(wchar_t), &ind );
 	if (ind != 0) {
 		printf("%s %u   Error -%ls- <> -%ls-\n",
 					 __FUNCTION__, __LINE__,  str1, str2);
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -310,18 +335,21 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESNOSPC) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #ifdef SAFE_LIB_STR_NULL_SLACK
     for (i=0; i<5; i++) {
         if (str1[i] != L'\0') {
             printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+            ++errs;
         }
     }
 #else
     if (str1[0] != L'\0') {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 #endif
 
@@ -335,18 +363,21 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #ifdef SAFE_LIB_STR_NULL_SLACK
 	for (i=0; i<5; i++) {
 		if (str1[i] != L'\0') {
 			printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+			++errs;
 		}
 	}
 #else
 	if (str1[5] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #endif
 
@@ -362,17 +393,20 @@ printf("Test #%d:\n", ++testno);
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	if (str2[16] == L'\0' && str2[17] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	rc = memcmp_s(str1, LEN, str2, (17)*sizeof(wchar_t), &ind );
 	if (ind != 0) {
 		printf("%s %u   Error -%ls- <> -%ls-\n",
 					 __FUNCTION__, __LINE__,  str1, str2);
+		++errs;
 	}
 
 
@@ -388,17 +422,20 @@ printf("Test #%d:\n", ++testno);
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	if (str1[sz] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 	rc = memcmp_s(str2, LEN, str1, (sz+1)*sizeof(wchar_t), &ind );
 	if (ind != 0) {
 		printf("%s %u   Error -%ls- <> -%ls-\n",
 					 __FUNCTION__, __LINE__,  str2, str1);
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -414,18 +451,21 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESNOSPC) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #ifdef SAFE_LIB_STR_NULL_SLACK
 	for (i=0; i<5; i++) {
 		if (str1[i] != L'\0') {
 			printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+			++errs;
 		}
 	}
 #else
 	if (str2[0] != L'\0') {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 #endif
 
@@ -442,17 +482,20 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     sz = wcsnlen_s(str1, LEN);
     if (sz != sz_orig && sz == 14) {
             printf("%s %u (sz=%lu <> 5) Error rc=%u \n",
                          __FUNCTION__, __LINE__,  sz, rc );
+            ++errs;
     }
     rc = memcmp_s(str1, LEN, str2, (sz)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls- <> -%ls-  (size=%lu) Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, str2, sz, rc );
+        ++errs;
     }
 
 
@@ -469,12 +512,14 @@ printf("Test #%d:\n", ++testno);
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
     rc = memcmp_s(str1, LEN, str2, (3)*sizeof(wchar_t), &ind );
     if (ind != 0) {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 
 
@@ -492,14 +537,16 @@ printf("Test #%d:\n", ++testno);
 	if (rc != ESNOSPC) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
     if (*str2 != L'\0') {
         printf("%s %u -%ls-  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  str1, rc );
+        ++errs;
     }
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_wcsnlen_s.c b/unittests/test_wcsnlen_s.c
index 755adee..5c16e56 100644
--- a/unittests/test_wcsnlen_s.c
+++ b/unittests/test_wcsnlen_s.c
@@ -64,6 +64,7 @@ extern errno_t wmemset_s (wchar_t *dest, wchar_t value, rsize_t len);
 int test_wcsnlen_s (void)
 {
     errno_t rc;
+    int errs = 0;
     unsigned int testno = 0;
 
 
@@ -76,6 +77,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != 0) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -86,6 +88,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != 0) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -98,6 +101,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != 40) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -110,6 +114,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != 20) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -122,6 +127,7 @@ printf("Test #%d:\n", ++testno);
 	if (rc != 0) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc );
+		++errs;
 	}
 
 
@@ -136,6 +142,7 @@ printf("Test #%d:\n", ++testno);
     if (rc != 1) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -148,9 +155,10 @@ printf("Test #%d:\n", ++testno);
     if (rc != 2) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+        ++errs;
     }
 
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_wmemcmp_s.c b/unittests/test_wmemcmp_s.c
index 532a569..3617db6 100644
--- a/unittests/test_wmemcmp_s.c
+++ b/unittests/test_wmemcmp_s.c
@@ -70,9 +70,10 @@
 extern errno_t wmemcmp_s (const wchar_t *dest, rsize_t dmax,
                           const wchar_t *src,  rsize_t smax, int *diff);
 
-int test_wmemcmp_s()
+int test_wmemcmp_s(void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
     int32_t  ind;
     uint32_t i;
@@ -91,6 +92,7 @@ int test_wmemcmp_s()
     if (rc != ESNULLP) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -101,6 +103,7 @@ int test_wmemcmp_s()
     if (rc != ESNULLP) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -111,6 +114,7 @@ int test_wmemcmp_s()
     if (rc != ESNULLP) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -121,6 +125,7 @@ int test_wmemcmp_s()
     if (rc != ESZEROL) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -131,6 +136,7 @@ int test_wmemcmp_s()
     if (rc != ESZEROL) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -141,6 +147,7 @@ int test_wmemcmp_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -151,6 +158,7 @@ int test_wmemcmp_s()
     if (rc != ESLEMAX) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -165,17 +173,20 @@ int test_wmemcmp_s()
     if (rc != EOK) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
                      __FUNCTION__, __LINE__,  ind, rc );
+        ++errs;
     }
 
     ind = memcmp(mem1, mem2, len*4);
     if (ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
                      __FUNCTION__, __LINE__,  ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -190,17 +201,20 @@ int test_wmemcmp_s()
     if (rc != EOK) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
                      __FUNCTION__, __LINE__,  ind, rc );
+        ++errs;
     }
 
     ind = memcmp(mem1, mem2, len*4);
     if (ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
                      __FUNCTION__, __LINE__,  ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -214,17 +228,20 @@ int test_wmemcmp_s()
     if (rc != EOK) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
     if (ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
                      __FUNCTION__, __LINE__,  ind, rc );
+        ++errs;
     }
 
     ind = memcmp(mem1, mem2, LEN*4);
     if (ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
                      __FUNCTION__, __LINE__,  ind, rc );
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -240,11 +257,13 @@ int test_wmemcmp_s()
     if (rc != EOK) {
         printf("%s %u  Ind=%d  Error rc=%u \n",
                      __FUNCTION__, __LINE__, ind, rc );
+        ++errs;
     }
 
     if (ind <= 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
                      __FUNCTION__, __LINE__,  ind, rc );
+        ++errs;
     }
 
 
@@ -261,11 +280,13 @@ int test_wmemcmp_s()
 	if (rc != EOK) {
 		printf("%s %u  Ind=%d  Error rc=%u \n",
 					 __FUNCTION__, __LINE__, ind, rc );
+	    ++errs;
 	}
 
 	if (ind >= 0) {
 		printf("%s %u  Ind=%d  rc=%u \n",
 					 __FUNCTION__, __LINE__,  ind, rc );
+	    ++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -281,11 +302,13 @@ int test_wmemcmp_s()
 	if (rc != EOK) {
 		printf("%s %u  Ind=%d  Error rc=%u \n",
 					 __FUNCTION__, __LINE__, ind, rc );
+	    ++errs;
 	}
 
 	if (ind >= 0) {
 		printf("%s %u  Ind=%d  rc=%u \n",
 					 __FUNCTION__, __LINE__,  ind, rc );
+	    ++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -301,11 +324,13 @@ int test_wmemcmp_s()
 	if (rc != EOK) {
 		printf("%s %u  Ind=%d  Error rc=%u \n",
 					 __FUNCTION__, __LINE__, ind, rc );
+	    ++errs;
 	}
 
 	if (ind <= 0) {
 		printf("%s %u  Ind=%d  rc=%u \n",
 					 __FUNCTION__, __LINE__,  ind, rc );
+	    ++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -321,11 +346,13 @@ int test_wmemcmp_s()
 	if (rc != EOK) {
 		printf("%s %u  Ind=%d  Error rc=%u \n",
 					 __FUNCTION__, __LINE__, ind, rc );
+	    ++errs;
 	}
 
 	if (ind >= 0) {
 		printf("%s %u  Ind=%d  rc=%u \n",
 					 __FUNCTION__, __LINE__,  ind, rc );
+	    ++errs;
 	}
 
 /*--------------------------------------------------*/
@@ -341,15 +368,17 @@ int test_wmemcmp_s()
 	if (rc != EOK) {
 		printf("%s %u  Ind=%d  Error rc=%u \n",
 					 __FUNCTION__, __LINE__, ind, rc );
+	    ++errs;
 	}
 
 	if (ind <= 0) {
 		printf("%s %u  Ind=%d  rc=%u \n",
 					 __FUNCTION__, __LINE__,  ind, rc );
+	    ++errs;
 	}
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
diff --git a/unittests/test_wmemcpy_s.c b/unittests/test_wmemcpy_s.c
index 568b616..ed2a83a 100644
--- a/unittests/test_wmemcpy_s.c
+++ b/unittests/test_wmemcpy_s.c
@@ -69,6 +69,7 @@ extern errno_t wmemcpy_s(wchar_t* dest, rsize_t dmax, const wchar_t* src, rsize_
 int test_wmemcpy_s (void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     rsize_t len;
     unsigned int testno = 0;
@@ -83,6 +84,7 @@ int test_wmemcpy_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -94,6 +96,7 @@ int test_wmemcpy_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -104,6 +107,7 @@ int test_wmemcpy_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -114,6 +118,7 @@ int test_wmemcpy_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -124,6 +129,7 @@ int test_wmemcpy_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -134,6 +140,7 @@ int test_wmemcpy_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -144,6 +151,7 @@ int test_wmemcpy_s (void)
     if (rc != ESOVRLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -154,6 +162,7 @@ int test_wmemcpy_s (void)
 	if (rc != ESOVRLP) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+	    ++errs;
 	}
 
 
@@ -169,16 +178,19 @@ int test_wmemcpy_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     	if ( mem1[0] != 40 && mem1[10] != 40) {
             printf("%d - %d m1[0]=%d  m1[10]=%d should be 40  \n",
                  __LINE__, i, mem1[0], mem1[10]);
+	    ++errs;
     	}
 		for (i=1; i<10; i++) {
 			if (mem1[i] != 44) {
 				printf("%d - %d m1=%d  should be 44  \n",
 					 __LINE__, i, mem1[i]);
+			    ++errs;
 			}
 		}
     }
@@ -195,19 +207,21 @@ int test_wmemcpy_s (void)
     if (rc == EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
-
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[i] != 33) {
         printf("%d - %lu m1=%d  m2=%d  \n",
                  __LINE__, len, mem1[len], mem2[len]);
+        ++errs;
     }
 
     }
@@ -224,19 +238,21 @@ int test_wmemcpy_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
-
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[len] != 33) {
             printf("%d - %lu m1=%d  m2=%d  \n",
                  __LINE__, len, mem1[len], mem2[len]);
+            ++errs;
     }
     }
 
@@ -252,7 +268,7 @@ int test_wmemcpy_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
-
+        ++errs;
     } else {
 
     /* verify mem1 was zeroed */
@@ -260,12 +276,14 @@ int test_wmemcpy_s (void)
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[len] != 33) {
             printf("%d - %lu m1=%d  m2=%d  \n",
                  __LINE__, len, mem1[len], mem2[len]);
+            ++errs;
     }
 
     }
@@ -282,6 +300,7 @@ int test_wmemcpy_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     } else {
 
 		/* verify mem1 was zeroed */
@@ -289,12 +308,14 @@ int test_wmemcpy_s (void)
 			if (mem1[i] != 0) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
 
 		if (mem1[len] == 0) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 		}
 
     }
@@ -310,6 +331,7 @@ int test_wmemcpy_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -325,18 +347,21 @@ int test_wmemcpy_s (void)
     if (rc != ESOVRLP) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
 
     if (mem1[len] == 0) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
     }
 
     }
@@ -354,12 +379,14 @@ int test_wmemcpy_s (void)
     if (rc != ESOVRLP) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
 		for (i=10; i<len+10; i++) {
 			if (mem1[i] != 0) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
 
@@ -377,12 +404,14 @@ int test_wmemcpy_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<len; i++) {
         if (mem1[i] != 55) {
             printf("%d - %d m1=%d\n",
                  __LINE__, i, mem1[i]);
+            ++errs;
         }
     }
 
@@ -399,12 +428,14 @@ int test_wmemcpy_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     for (i=0; i<LEN/2; i++) {
         if (mem1[i] != 55) {
             printf("%d - %d m1=%d  m2=%d  \n",
                  __LINE__, i, mem1[i], mem2[i]);
+            ++errs;
         }
     }
     }
@@ -412,6 +443,6 @@ int test_wmemcpy_s (void)
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_wmemmove_s.c b/unittests/test_wmemmove_s.c
index 878e4ce..eccf16d 100644
--- a/unittests/test_wmemmove_s.c
+++ b/unittests/test_wmemmove_s.c
@@ -78,6 +78,7 @@ extern errno_t wmemmove_s(wchar_t* dest, rsize_t dmax, const wchar_t* src, size_
 int test_wmemmove_s (void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t i;
     rsize_t len;
     unsigned int testno = 0;
@@ -92,6 +93,7 @@ int test_wmemmove_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -103,6 +105,7 @@ int test_wmemmove_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -113,6 +116,7 @@ int test_wmemmove_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -123,6 +127,7 @@ int test_wmemmove_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -133,6 +138,7 @@ int test_wmemmove_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -143,6 +149,7 @@ int test_wmemmove_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -153,6 +160,7 @@ int test_wmemmove_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -163,6 +171,7 @@ int test_wmemmove_s (void)
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	}
 
 
@@ -178,16 +187,19 @@ int test_wmemmove_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
     	if ( mem1[0] != 40 && mem1[10] != 40) {
             printf("%d - %d m1[0]=%d  m1[10]=%d should be 40  \n",
                  __LINE__, i, mem1[0], mem1[10]);
+            ++errs;
     	}
 		for (i=1; i<10; i++) {
 			if (mem1[i] != 44) {
 				printf("%d - %d m1=%d  should be 44  \n",
 					 __LINE__, i, mem1[i]);
+				++errs;
 			}
 		}
     }
@@ -204,19 +216,21 @@ int test_wmemmove_s (void)
     if (rc == EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
-
+        ++errs;
     } else {
 
 		for (i=0; i<len; i++) {
 			if (mem1[i] != 0) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
 
 		if (mem1[i] != 33) {
 			printf("%d - %lu m1=%d  m2=%d  \n",
 					 __LINE__, len, mem1[len], mem2[len]);
+			++errs;
 		}
 
     }
@@ -233,19 +247,21 @@ int test_wmemmove_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
-
+        ++errs;
     } else {
 
 		for (i=0; i<len; i++) {
 			if (mem1[i] != 0) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
 
 		if (mem1[len] != 33) {
 				printf("%d - %lu m1=%d  m2=%d  \n",
 					 __LINE__, len, mem1[len], mem2[len]);
+				++errs;
 		}
     }
 
@@ -261,7 +277,7 @@ int test_wmemmove_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
-
+        ++errs;
     } else {
 
 		/* verify mem1 was copied */
@@ -269,12 +285,14 @@ int test_wmemmove_s (void)
 			if (mem1[i] != mem2[i]) {
 				printf("%d - %d m1=%d <> m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
 
 		if (mem1[len] != 33 && mem1[len+1] != 33) {
 				printf("%d - %lu m1[len]=%d  m1[len+1]=%d  \n",
 					 __LINE__, len, mem1[len], mem1[len+1]);
+				++errs;
 		}
 
     }
@@ -291,6 +309,7 @@ int test_wmemmove_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     } else {
 
 		/* verify mem1 was copied properly */
@@ -298,6 +317,7 @@ int test_wmemmove_s (void)
 			if (mem1[i] != 44) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
 
@@ -315,6 +335,7 @@ int test_wmemmove_s (void)
 	if (rc != EOK) {
 		printf("%s %u   Error rc=%u \n",
 					 __FUNCTION__, __LINE__, rc);
+		++errs;
 	} else {
 
 		/* verify mem1 was copied properly */
@@ -322,18 +343,21 @@ int test_wmemmove_s (void)
 			if (mem1[i] != i) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
 		for (i=10; i<LEN; i++) {
 			if (mem1[i] != i-10) {
 				printf("%d - %d m1=%d  should=%d  \n",
 					 __LINE__, i, mem1[i], i-10);
+				++errs;
 			}
 		}
 
 		if ( mem1[LEN] != LEN && mem1[LEN+1] != LEN+1) {
 			printf("%d - %d m1[LEN]=%d  mem1[LEN+1]=%d should be 1024 & 1025  \n",
 				 __LINE__, i, mem1[LEN], mem1[LEN+1]);
+			++errs;
 		}
 
 	}
@@ -349,6 +373,7 @@ int test_wmemmove_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     }
 
 
@@ -364,12 +389,14 @@ int test_wmemmove_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
 		for (i=0; i<len; i++) {
 			if (mem1[i] != 55) {
 				printf("%d - %d m1=%d\n",
 					 __LINE__, i, mem1[i]);
+				++errs;
 			}
 		}
 
@@ -386,12 +413,14 @@ int test_wmemmove_s (void)
     if (rc != EOK) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc);
+        ++errs;
     } else {
 
 		for (i=0; i<LEN/2; i++) {
 			if (mem1[i] != 55) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
+				++errs;
 			}
 		}
     }
@@ -408,16 +437,19 @@ int test_wmemmove_s (void)
 	if (rc != EOK) {
 		printf("%s %u  Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	} else {
 
 		if ( mem1[0] != 0x00003723 ) {
 			printf("%d - %d first char memory incorrect m1=%04x  \n",
 				 __LINE__, i, mem1[i]);
+			++errs;
 		}
 		for (i=1; i<10; i++) {
 			if (mem1[i] != 0x00003700) {
 				printf("%d - %d m1=%04x  \n",
 					 __LINE__, i, mem1[i]);
+				++errs;
 			}
 		}
 	}
@@ -434,16 +466,19 @@ int test_wmemmove_s (void)
 	if (rc != EOK) {
 		printf("%s %u  Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
+		++errs;
 	} else {
 
 		if ( mem1[0] != 0x00370023 ) {
 			printf("%d - %d first char memory incorrect m1=%04x  \n",
 				 __LINE__, i, mem1[i]);
+			++errs;
 		}
 		for (i=1; i<10; i++) {
 			if (mem1[i] != 0x00370000) {
 				printf("%d - %d m1=%04x  \n",
 					 __LINE__, i, mem1[i]);
+				++errs;
 			}
 		}
 	}
@@ -451,6 +486,6 @@ int test_wmemmove_s (void)
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 
diff --git a/unittests/test_wmemset_s.c b/unittests/test_wmemset_s.c
index ed27c4c..82cdd33 100644
--- a/unittests/test_wmemset_s.c
+++ b/unittests/test_wmemset_s.c
@@ -66,6 +66,7 @@ extern errno_t wmemset_s (wchar_t *dest, wchar_t value, rsize_t len);
 int test_wmemset_s (void)
 {
     errno_t rc;
+    int errs = 0;
     uint32_t len;
     uint32_t i;
     unsigned int testno = 0;
@@ -82,6 +83,7 @@ int test_wmemset_s (void)
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -93,6 +95,7 @@ int test_wmemset_s (void)
     if (rc != ESZEROL) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -105,6 +108,7 @@ int test_wmemset_s (void)
     if (rc != ESLEMAX) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
 /*--------------------------------------------------*/
@@ -120,16 +124,19 @@ int test_wmemset_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if ( mem1[0] != value ) {
         printf("%d - m1[0]=%d \n",
              __LINE__, mem1[0]);
+        ++errs;
     }
     for (i=1; i<LEN; i++) {
         if (mem1[i] != 99) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+	    ++errs;
         }
     }
 
@@ -146,16 +153,19 @@ int test_wmemset_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     if ( mem1[0] != value || mem1[1] != value ) {
         printf("%d - m1[0]=%d m1[1]=%d \n",
              __LINE__, mem1[0], mem1[1]);
+        ++errs;
     }
     for (i=2; i<LEN; i++) {
         if (mem1[i] != 99) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+	    ++errs;
         }
     }
 
@@ -173,18 +183,21 @@ int test_wmemset_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+	    ++errs;
         }
     }
     for (i=len; i<LEN; i++) {
         if (mem1[i] != 99) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+	    ++errs;
         }
     }
 
@@ -201,12 +214,14 @@ int test_wmemset_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+	    ++errs;
         }
     }
 
@@ -223,18 +238,20 @@ int test_wmemset_s (void)
     if (rc != EOK) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
+        ++errs;
     }
 
     for (i=0; i<len; i++) {
         if (mem1[i] != value) {
             printf("%d - %d m1=%d \n",
                  __LINE__, i, mem1[i]);
+	    ++errs;
         }
     }
 
 /*--------------------------------------------------*/
 /*--------------------------------------------------*/
 
-    return (0);
+    return errs;
 }
 

From 4913e2eaea70c6b2d911fd739705ac62be419ce0 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 15:39:00 -0700
Subject: [PATCH 04/18] safestringlib: Add objtest, libsafestring.a and
 safestringtest to .gitignore

Ignore more built items.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 60bfe41..8ee853d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,9 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+/libsafestring.a
+/objtest
+/safestringtest
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

From 7035f8cc25b6244498cadcad051a50bec10fccce Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 15:46:52 -0700
Subject: [PATCH 05/18] safestringlib: Fix bad pointer comparisons in
 strcasestr_s tests

The return values from strcasestr and strcasestr_s were being cast
to int for comparison. This is bogus because pointers are only
guaranteed to fit in longs. I suspect that this was done due to compiler
warnings. Those warnings were because strcasestr was compiled
without a prototype because it is _GNU_SOURCE only, and that symbol
was not defined. So without the prototype, the return value of
strcasestr was an integer and not a pointer. I assume that the
warnings were not enabled to reveal the missing prototype.

Fix both problems.

Signed-off-by: Mark Rustad <MRustad@gmail.com>>
---
 unittests/test_private.h      |  1 +
 unittests/test_strcasestr_s.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/unittests/test_private.h b/unittests/test_private.h
index 24f9c99..ca2aa5a 100644
--- a/unittests/test_private.h
+++ b/unittests/test_private.h
@@ -43,6 +43,7 @@
 
 #else
 
+#define _GNU_SOURCE 1 /* needed to define strcasestr */
 #include <stdio.h>
 #include <string.h>
 
diff --git a/unittests/test_strcasestr_s.c b/unittests/test_strcasestr_s.c
index fb5de23..9ac64ea 100644
--- a/unittests/test_strcasestr_s.c
+++ b/unittests/test_strcasestr_s.c
@@ -13,7 +13,7 @@
 
 extern errno_t strcasestr_s (char *dest, rsize_t dmax, const char *src, rsize_t slen, char **substring);
 
-int test_strcasestr_s()
+int test_strcasestr_s(void)
 {
     int errs = 0;
     errno_t rc;
@@ -146,7 +146,7 @@ int test_strcasestr_s()
 
     /* compare to legacy */
     std_sub = strcasestr(str1, str2);
-    if ((int)sub != (int)std_sub) { // comparison to handle 32-bit library return and 64-bit library return
+    if (sub != std_sub) {
         printf("%s %u  Error strcasestr_s() does not have same return as strcasestr() when str1 & str2 are zero length strings. rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
         printf("str1:[%s]\n", str1);
@@ -176,7 +176,7 @@ int test_strcasestr_s()
 
     /* compare to legacy */
     std_sub = strcasestr(str1, str2);
-    if ((int)sub != (int)std_sub) { // comparison to handle 32-bit library return and 64-bit library return
+    if (sub != std_sub) {
         printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is zero length string. rc=%u \n",
                              __FUNCTION__, __LINE__, rc);
         printf("str1:[%s]\n", str1);
@@ -207,7 +207,7 @@ int test_strcasestr_s()
 
     /* compare to legacy */
     std_sub = strcasestr(str1, str2);
-    if ((int)sub != (int)std_sub) { // comparison to handle 32-bit library return and 64-bit library return
+    if (sub != std_sub) {
         printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is zero length string. rc=%u \n",
                                      __FUNCTION__, __LINE__, rc);
         printf("str1:[%s]\n", str1);
@@ -298,7 +298,7 @@ int test_strcasestr_s()
 
     /* compare to legacy */
     std_sub = strcasestr(str1, str2);
-    if ((int)sub != (int)std_sub) { // comparison to handle 32-bit library return and 64-bit library return
+    if (sub != std_sub) {
         printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is substring of the end of str1. rc=%u \n",
                                      __FUNCTION__, __LINE__, rc);
         printf("str1:[%s]\n", str1);
@@ -332,7 +332,7 @@ int test_strcasestr_s()
 
     /* compare to legacy */
     std_sub = strcasestr(str1, str2);
-    if ((int)sub != (int)std_sub) { // comparison to handle 32-bit library return and 64-bit library return
+    if (sub != std_sub) {
         printf("%s %u  Error strcasestr_s() does not have same return value as strcasestr() when str2 is substring of middle of str1. rc=%u \n",
                                      __FUNCTION__, __LINE__, rc);
         printf("str1:[%s]\n", str1);
@@ -472,7 +472,7 @@ int test_strcasestr_s()
 
     /* compare to legacy */
     std_sub = strcasestr(str1, str2);
-    if ((int)sub != (int)std_sub) { // comparison to handle 32-bit library return and 64-bit library return
+    if (sub != std_sub) {
         printf("%s %u  Error rc=%u \n",
                      __FUNCTION__, __LINE__, rc);
         ++errs;

From 4c51224c03f794b58c6576f39fb205416744ae86 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 16:24:40 -0700
Subject: [PATCH 06/18] safestringlib: Fix bad casts reported by compiler
 warnings

Casting a char * to a wchar_t makes no sense, especially when
the value is supposed to be a wchar_t *. I don't know how this
could even be working.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 unittests/test_wmemmove_s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unittests/test_wmemmove_s.c b/unittests/test_wmemmove_s.c
index eccf16d..d4567be 100644
--- a/unittests/test_wmemmove_s.c
+++ b/unittests/test_wmemmove_s.c
@@ -433,7 +433,7 @@ int test_wmemmove_s (void)
 	for (i=0; i<LEN; i++) { mem1[i] = 35; }
 	for (i=0; i<LEN; i++) { mem2[i] = 55; }
 
-	rc = wmemmove_s((wchar_t)(((char *)mem1)+1), LEN, mem2, 10);
+	rc = wmemmove_s((wchar_t *)(((char *)mem1)+1), LEN, mem2, 10);
 	if (rc != EOK) {
 		printf("%s %u  Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);
@@ -462,7 +462,7 @@ int test_wmemmove_s (void)
 	for (i=0; i<LEN; i++) { mem1[i] = 35; }
 	for (i=0; i<LEN; i++) { mem2[i] = 55; }
 
-	rc = wmemmove_s((wchar_t)(((char *)mem1)+2), LEN, mem2, 10);
+	rc = wmemmove_s((wchar_t *)(((char *)mem1)+2), LEN, mem2, 10);
 	if (rc != EOK) {
 		printf("%s %u  Error rc=%u \n",
 					 __FUNCTION__, __LINE__,  rc);

From cc9ee424aa8b60261179c4d6985117246ff28664 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 16:36:04 -0700
Subject: [PATCH 07/18] safestringlib: Add missing includes to resolve warnings

Include ctype.h and stdlib.h to get prototypes for functions
referenced. This resolves implicit declaration warnings.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 safeclib/safeclib_private.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/safeclib/safeclib_private.h b/safeclib/safeclib_private.h
index 7280e87..3967d55 100644
--- a/safeclib/safeclib_private.h
+++ b/safeclib/safeclib_private.h
@@ -51,6 +51,9 @@
 
 #if HAVE_CONFIG_H
 #include "config.h"
+#else
+#include <ctype.h>
+#include <stdlib.h>
 #endif
 
 #include <stdio.h>

From 5358ad3b74a7aaae84d73f19220b0b9cdb3303cb Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 16:57:09 -0700
Subject: [PATCH 08/18] safestringlib: Fix bad check in memcmp32_s test

The code is checking the wrong variable when testing memcmp_s.
This was found by compiling with -Wall and finding a set but
unused variable.  Also changed the type of the variable, since
memcmp returns an int, not an int32_t.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 unittests/test_memcmp32_s.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/unittests/test_memcmp32_s.c b/unittests/test_memcmp32_s.c
index c6bdb20..d6251e7 100644
--- a/unittests/test_memcmp32_s.c
+++ b/unittests/test_memcmp32_s.c
@@ -15,7 +15,7 @@ int test_memcmp32_s(void)
     int errs = 0;
     uint32_t len;
     int32_t  ind;
-    int32_t  std_ind;
+    int      std_ind;
     uint32_t i;
 
     uint32_t  mem1[LEN];
@@ -104,9 +104,9 @@ int test_memcmp32_s(void)
     }
 
     std_ind = memcmp(mem1, mem2, len*4);
-    if (ind != 0) {
+    if (std_ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
-               __FUNCTION__, __LINE__,  ind, rc);
+               __FUNCTION__, __LINE__,  std_ind, rc);
         ++errs;
     }
 
@@ -130,9 +130,9 @@ int test_memcmp32_s(void)
     }
 
     std_ind = memcmp(mem1, mem2, len*4);
-    if (ind != 0) {
+    if (std_ind != 0) {
         printf("%s %u  Ind=%d  rc=%u \n",
-               __FUNCTION__, __LINE__,  ind, rc);
+               __FUNCTION__, __LINE__,  std_ind, rc);
         ++errs;
     }
 

From af3ac9deb539756cf9452e793334d46b481d81d7 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 17:02:17 -0700
Subject: [PATCH 09/18] safestringlib: Shorten long lines

Extremely long lines make patches hard to review. Shorten them by
using simply expanded variables and appending to them. These
variables have no need for recursive expansion.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 makefile | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/makefile b/makefile
index 8a417c6..eb2f960 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,8 @@
 IDIR = include
 MKDIR_P = mkdir -p
 CC=gcc
-CFLAGS=-I$(IDIR) -fstack-protector-strong -fPIE -fPIC -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+CFLAGS := -I${IDIR} -fstack-protector-strong -fPIE -fPIC -O2
+CFLAGS += -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
 LDFLAGS=-z noexecstack -z now
 
 ODIR=obj
@@ -9,10 +10,11 @@ OTDIR=objtest
 SRCDIR=safeclib
 TESTDIR=unittests
 
+_DEPS := safe_lib_errno.h safe_lib.h safe_str_lib.h safe_types.h.in
+_DEPS += safe_lib_errno.h.in safe_mem_lib.h safe_types.h
 
-_DEPS = safe_lib_errno.h     safe_lib.h      safe_str_lib.h  safe_types.h.in safe_lib_errno.h.in  safe_mem_lib.h  safe_types.h
-
-_ODEPS = mem_primitives_lib.h  safeclib_private.h safe_mem_constraint.h  safe_str_constraint.h
+_ODEPS := mem_primitives_lib.h safeclib_private.h safe_mem_constraint.h
+_ODEPS += safe_str_constraint.h
 
 all: directories libsafestring.a safestringtest
 
@@ -20,8 +22,23 @@ all: directories libsafestring.a safestringtest
 DEPS = $(addprefix $(IDIR)/,$(_DEPS))
 ODEPS = $(addprefix $(SRCDIR)/,$(_ODEPS))
 
-
-_CLIB = abort_handler_s.c stpcpy_s.c strlastsame_s.c ignore_handler_s.c stpncpy_s.c strljustify_s.c memcmp16_s.c strcasecmp_s.c strncat_s.c memcmp32_s.c strcasestr_s.c strncpy_s.c memcmp_s.c strcat_s.c strnlen_s.c memcpy16_s.c strcmpfld_s.c strnterminate_s.c memcpy32_s.c strcmp_s.c strpbrk_s.c memcpy_s.c strcpyfldin_s.c strprefix_s.c memmove16_s.c strcpyfldout_s.c strremovews_s.c memmove32_s.c strcpyfld_s.c strspn_s.c memmove_s.c strcpy_s.c strstr_s.c mem_primitives_lib.c strcspn_s.c strtok_s.c strfirstchar_s.c strtolowercase_s.c memset16_s.c strfirstdiff_s.c strtouppercase_s.c memset32_s.c strfirstsame_s.c strzero_s.c memset_s.c strisalphanumeric_s.c  wcpcpy_s.c memzero16_s.c strisascii_s.c wcscat_s.c memzero32_s.c strisdigit_s.c wcscpy_s.c memzero_s.c strishex_s.c wcsncat_s.c     strislowercase_s.c wcsncpy_s.c safe_mem_constraint.c strismixedcase_s.c wcsnlen_s.c  strispassword_s.c wmemcmp_s.c safe_str_constraint.c strisuppercase_s.c wmemcpy_s.c strlastchar_s.c wmemmove_s.c snprintf_support.c strlastdiff_s.c wmemset_s.c
+_CLIB := abort_handler_s.c stpcpy_s.c strlastsame_s.c ignore_handler_s.c
+_CLIB += stpncpy_s.c strljustify_s.c memcmp16_s.c strcasecmp_s.c strncat_s.c
+_CLIB += memcmp32_s.c strcasestr_s.c strncpy_s.c memcmp_s.c strcat_s.c
+_CLIB += strnlen_s.c memcpy16_s.c strcmpfld_s.c strnterminate_s.c memcpy32_s.c
+_CLIB += strcmp_s.c strpbrk_s.c memcpy_s.c strcpyfldin_s.c strprefix_s.c
+_CLIB += memmove16_s.c strcpyfldout_s.c strremovews_s.c memmove32_s.c
+_CLIB += strcpyfld_s.c strspn_s.c memmove_s.c strcpy_s.c strstr_s.c
+_CLIB += mem_primitives_lib.c strcspn_s.c strtok_s.c strfirstchar_s.c
+_CLIB += strtolowercase_s.c memset16_s.c strfirstdiff_s.c strtouppercase_s.c
+_CLIB += memset32_s.c strfirstsame_s.c strzero_s.c memset_s.c
+_CLIB += strisalphanumeric_s.c  wcpcpy_s.c memzero16_s.c strisascii_s.c
+_CLIB += wcscat_s.c memzero32_s.c strisdigit_s.c wcscpy_s.c memzero_s.c
+_CLIB += strishex_s.c wcsncat_s.c strislowercase_s.c wcsncpy_s.c
+_CLIB += safe_mem_constraint.c strismixedcase_s.c wcsnlen_s.c
+_CLIB += strispassword_s.c wmemcmp_s.c safe_str_constraint.c
+_CLIB += strisuppercase_s.c wmemcpy_s.c strlastchar_s.c wmemmove_s.c
+_CLIB += snprintf_support.c strlastdiff_s.c wmemset_s.c
 
 _TLIST = $(addprefix $(ODIR)/,$(_CLIB))
 OBJ = $(patsubst %.c,%.o,$(_TLIST))
@@ -35,8 +52,28 @@ $(ODIR)/%.o: $(SRCDIR)/%.c $(DEPS) $(ODEPS)
 libsafestring.a: $(OBJ)
 	ar rcs $@ $^
 
-
-_TESTFUNCS = Safe_String_UnitTestMain.c test_strcmp_s.c test_strnlen_s.c test_memcmp16_s.c test_strcpyfldin_s.c test_strnterminate_s.c test_memcmp32_s.c test_strcpyfldout_s.c  test_strpbrk_s.c test_memcmp_s.c test_strcpyfld_s.c test_strprefix_s.c test_memcpy16_s.c test_strcpy_s.c test_strremovews_s.c test_memcpy32_s.c  test_strcspn_s.c test_strspn_s.c test_memcpy_s.c test_strfirstchar_s.c test_strstr_s.c test_memmove16_s.c test_strfirstdiff_s.c test_strtok_s.c test_memmove32_s.c test_strfirstsame_s.c test_strtolowercase_s.c test_memmove_s.c test_strisalphanumeric_s.c test_strtouppercase_s.c test_memset16_s.c test_strisascii_s.c test_strzero_s.c test_memset32_s.c test_strisdigit_s.c test_wcpcpy_s.c test_memset_s.c test_strishex_s.c test_wcscat_s.c test_memzero16_s.c test_strislowercase_s.c  test_wcscpy_s.c test_memzero32_s.c test_strismixed_s.c test_wcsncat_s.c test_memzero_s.c test_strispassword_s.c test_wcsncpy_s.c test_strisuppercase_s.c test_wcsnlen_s.c test_stpcpy_s.c test_strlastchar_s.c test_wmemcmp_s.c test_stpncpy_s.c test_strlastdiff_s.c test_wmemcpy_s.c test_strcasecmp_s.c test_strlastsame_s.c test_wmemmove_s.c test_strcasestr_s.c test_strljustify_s.c test_wmemset_s.c test_strcat_s.c test_strncat_s.c test_strcmpfld_s.c test_strncpy_s.c
+_TESTFUNCS := Safe_String_UnitTestMain.c test_strcmp_s.c test_strnlen_s.c
+_TESTFUNCS += test_memcmp16_s.c test_strcpyfldin_s.c test_strnterminate_s.c
+_TESTFUNCS += test_memcmp32_s.c test_strcpyfldout_s.c test_strpbrk_s.c
+_TESTFUNCS += test_memcmp_s.c test_strcpyfld_s.c test_strprefix_s.c
+_TESTFUNCS += test_memcpy16_s.c test_strcpy_s.c test_strremovews_s.c
+_TESTFUNCS += test_memcpy32_s.c test_strcspn_s.c test_strspn_s.c
+_TESTFUNCS += test_memcpy_s.c test_strfirstchar_s.c test_strstr_s.c
+_TESTFUNCS += test_memmove16_s.c test_strfirstdiff_s.c test_strtok_s.c
+_TESTFUNCS += test_memmove32_s.c test_strfirstsame_s.c test_strtolowercase_s.c
+_TESTFUNCS += test_memmove_s.c test_strisalphanumeric_s.c
+_TESTFUNCS += test_strtouppercase_s.c test_memset16_s.c test_strisascii_s.c
+_TESTFUNCS += test_strzero_s.c test_memset32_s.c test_strisdigit_s.c
+_TESTFUNCS += test_wcpcpy_s.c test_memset_s.c test_strishex_s.c test_wcscat_s.c
+_TESTFUNCS += test_memzero16_s.c test_strislowercase_s.c  test_wcscpy_s.c
+_TESTFUNCS += test_memzero32_s.c test_strismixed_s.c test_wcsncat_s.c
+_TESTFUNCS += test_memzero_s.c test_strispassword_s.c test_wcsncpy_s.c
+_TESTFUNCS += test_strisuppercase_s.c test_wcsnlen_s.c test_stpcpy_s.c
+_TESTFUNCS += test_strlastchar_s.c test_wmemcmp_s.c test_stpncpy_s.c
+_TESTFUNCS += test_strlastdiff_s.c test_wmemcpy_s.c test_strcasecmp_s.c
+_TESTFUNCS += test_strlastsame_s.c test_wmemmove_s.c test_strcasestr_s.c
+_TESTFUNCS += test_strljustify_s.c test_wmemset_s.c test_strcat_s.c
+_TESTFUNCS += test_strncat_s.c test_strcmpfld_s.c test_strncpy_s.c
 
 _TLIST2 = $(addprefix $(OTDIR)/,$(_TESTFUNCS))
 TOBJ = $(patsubst %.c,%.o,$(_TLIST2))

From bf361f4f72df127a5c4319d9eda3df585c5546cf Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 17:04:43 -0700
Subject: [PATCH 10/18] safestringlib: Use compiler-generated dependencies
 instead of a fixed list

The compiler generates perfectly good dependencies. Use them.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 makefile | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/makefile b/makefile
index eb2f960..0a57977 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 IDIR = include
 MKDIR_P = mkdir -p
 CC=gcc
-CFLAGS := -I${IDIR} -fstack-protector-strong -fPIE -fPIC -O2
+CFLAGS := -I${IDIR} -fstack-protector-strong -fPIE -fPIC -O2 -MMD
 CFLAGS += -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
 LDFLAGS=-z noexecstack -z now
 
@@ -10,18 +10,8 @@ OTDIR=objtest
 SRCDIR=safeclib
 TESTDIR=unittests
 
-_DEPS := safe_lib_errno.h safe_lib.h safe_str_lib.h safe_types.h.in
-_DEPS += safe_lib_errno.h.in safe_mem_lib.h safe_types.h
-
-_ODEPS := mem_primitives_lib.h safeclib_private.h safe_mem_constraint.h
-_ODEPS += safe_str_constraint.h
-
 all: directories libsafestring.a safestringtest
 
-
-DEPS = $(addprefix $(IDIR)/,$(_DEPS))
-ODEPS = $(addprefix $(SRCDIR)/,$(_ODEPS))
-
 _CLIB := abort_handler_s.c stpcpy_s.c strlastsame_s.c ignore_handler_s.c
 _CLIB += stpncpy_s.c strljustify_s.c memcmp16_s.c strcasecmp_s.c strncat_s.c
 _CLIB += memcmp32_s.c strcasestr_s.c strncpy_s.c memcmp_s.c strcat_s.c
@@ -45,8 +35,7 @@ OBJ = $(patsubst %.c,%.o,$(_TLIST))
 CLIB =$(addprefix $(SRCDIR)/,$(_CLIB))
 
 
-
-$(ODIR)/%.o: $(SRCDIR)/%.c $(DEPS) $(ODEPS)
+${ODIR}/%.o: ${SRCDIR}/%.c
 	$(CC) $(LDFLAGS) -c -o $@ $< $(CFLAGS)
 
 libsafestring.a: $(OBJ)
@@ -101,6 +90,9 @@ ${OTDIR}:
 .PHONY: clean
 
 clean:
-	rm -f $(ODIR)/*.o *~ core $(INCDIR)/*~ $(OTDIR)/*.o
+	rm -f ${ODIR}/* *~ core ${INCDIR}/*~ ${OTDIR}/*
 	rm -f libsafestring.a
 	rm -f safestringtest
+
+-include $(wildcard ${ODIR}/*.d)
+-include $(wildcard ${OTDIR}/*.d)

From fcc740ae4f917d3eb1749589ea4f68b522b9a16a Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 21:09:25 -0700
Subject: [PATCH 11/18] safestringlib: Fix used but uninitialized variables

Turning on -Wall revealed some uninitialized variables, so
fix them.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 unittests/test_strcpyfld_s.c    | 1 +
 unittests/test_strcpyfldout_s.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/unittests/test_strcpyfld_s.c b/unittests/test_strcpyfld_s.c
index 97b2bfd..fbab232 100644
--- a/unittests/test_strcpyfld_s.c
+++ b/unittests/test_strcpyfld_s.c
@@ -25,6 +25,7 @@ int test_strcpyfld_s(void)
 
 /*--------------------------------------------------*/
 
+    slen = sizeof(str2);
     rc = strcpyfld_s(NULL, LEN, str2, slen);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",
diff --git a/unittests/test_strcpyfldout_s.c b/unittests/test_strcpyfldout_s.c
index 2bd7211..e3c1e31 100644
--- a/unittests/test_strcpyfldout_s.c
+++ b/unittests/test_strcpyfldout_s.c
@@ -25,6 +25,7 @@ int test_strcpyfldout_s(void)
 
 /*--------------------------------------------------*/
 
+    slen = sizeof(str2);
     rc = strcpyfldout_s(NULL, LEN, str2, slen);
     if (rc != ESNULLP) {
         printf("%s %u   Error rc=%u \n",

From c1c77640f244ef06a6d071c8b184d0216d6c4b76 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 21:13:52 -0700
Subject: [PATCH 12/18] safestringlib: Turn on -Wall and resolve remaining
 warning

Turn on -Wall and resolve the remaining warning. This involved
eliminating a set but unused variable.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 makefile                             | 2 +-
 unittests/Safe_String_UnitTestMain.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index 0a57977..380e9fd 100644
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@ IDIR = include
 MKDIR_P = mkdir -p
 CC=gcc
 CFLAGS := -I${IDIR} -fstack-protector-strong -fPIE -fPIC -O2 -MMD
-CFLAGS += -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+CFLAGS += -D_FORTIFY_SOURCE=2 -Wall -Wformat -Wformat-security
 LDFLAGS=-z noexecstack -z now
 
 ODIR=obj
diff --git a/unittests/Safe_String_UnitTestMain.c b/unittests/Safe_String_UnitTestMain.c
index 04fceae..50428fd 100644
--- a/unittests/Safe_String_UnitTestMain.c
+++ b/unittests/Safe_String_UnitTestMain.c
@@ -178,7 +178,7 @@ int main(void) {
 	int    indicator = -1;
 
 	strcpy_s(dest, dmax, str);
-    char *ret = stpcpy_s(&dest[20], 108, str2, &err);
+    stpcpy_s(&dest[20], 108, str2, &err);
     if (err != EOK) {
 		puts("stpcpy_s returned failure");
 		++errs;

From 01ab7ddd99edaa202c150c90619813719d6e51c3 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 21:19:45 -0700
Subject: [PATCH 13/18] safestringlib: Add -Wextra and resolve the warnings

Add the -Wextra flag and resolve the resulting warnings. These
include marking unused parameters as unused, adding fallthrough
comments switch statement cases that fall through and resolving
sign comparison differences.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 makefile                       |   2 +-
 safeclib/abort_handler_s.c     |   2 +-
 safeclib/ignore_handler_s.c    |   9 +-
 safeclib/mem_primitives_lib.c  | 270 ++++++++++++++++-----------------
 safeclib/safe_str_constraint.h |   2 +
 safeclib/safeclib_private.h    |   6 +
 unittests/test_strcspn_s.c     |   8 +-
 unittests/test_strspn_s.c      |  12 +-
 unittests/test_wmemmove_s.c    |   4 +-
 9 files changed, 165 insertions(+), 150 deletions(-)

diff --git a/makefile b/makefile
index 380e9fd..264f3f1 100644
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@ IDIR = include
 MKDIR_P = mkdir -p
 CC=gcc
 CFLAGS := -I${IDIR} -fstack-protector-strong -fPIE -fPIC -O2 -MMD
-CFLAGS += -D_FORTIFY_SOURCE=2 -Wall -Wformat -Wformat-security
+CFLAGS += -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wformat-security
 LDFLAGS=-z noexecstack -z now
 
 ODIR=obj
diff --git a/safeclib/abort_handler_s.c b/safeclib/abort_handler_s.c
index d956bfd..97e11bd 100644
--- a/safeclib/abort_handler_s.c
+++ b/safeclib/abort_handler_s.c
@@ -65,7 +65,7 @@
  *
  */
 
-void abort_handler_s(const char *msg, void *ptr, errno_t error)
+void abort_handler_s(const char *msg, _UNUSED void *ptr, errno_t error)
 {
 	slprintf("ABORT CONSTRAINT HANDLER: (%u) %s\n", error,
 		 (msg) ? msg : "Null message");
diff --git a/safeclib/ignore_handler_s.c b/safeclib/ignore_handler_s.c
index 412e0cb..3e9b8c1 100644
--- a/safeclib/ignore_handler_s.c
+++ b/safeclib/ignore_handler_s.c
@@ -31,6 +31,12 @@
 
 #include "safeclib_private.h"
 
+#ifdef DEBUG
+#define _DUNUSED
+#else
+#define _DUNUSED _UNUSED
+#endif /* DEBUG */
+
 /**
  * NAME
  *    ignore_handler_s
@@ -62,7 +68,8 @@
  *
  */
 
-void ignore_handler_s(const char *msg, void *ptr, errno_t error)
+void ignore_handler_s(_DUNUSED const char *msg, _UNUSED void *ptr,
+		      _DUNUSED errno_t error)
 {
 
 	sldebug_printf("IGNORE CONSTRAINT HANDLER: (%u) %s\n", error,
diff --git a/safeclib/mem_primitives_lib.c b/safeclib/mem_primitives_lib.c
index cc189e5..285ae91 100644
--- a/safeclib/mem_primitives_lib.c
+++ b/safeclib/mem_primitives_lib.c
@@ -108,21 +108,21 @@ mem_prim_set (void *dest, uint32_t len, uint8_t value)
             lcount -= 16;
             break;
 
-        case 15:  *lp++ = value32;
-        case 14:  *lp++ = value32;
-        case 13:  *lp++ = value32;
-        case 12:  *lp++ = value32;
-        case 11:  *lp++ = value32;
-        case 10:  *lp++ = value32;
-        case 9:  *lp++ = value32;
-        case 8:  *lp++ = value32;
-
-        case 7:  *lp++ = value32;
-        case 6:  *lp++ = value32;
-        case 5:  *lp++ = value32;
-        case 4:  *lp++ = value32;
-        case 3:  *lp++ = value32;
-        case 2:  *lp++ = value32;
+        case 15:  *lp++ = value32; /* Fallthrough */
+        case 14:  *lp++ = value32; /* Fallthrough */
+        case 13:  *lp++ = value32; /* Fallthrough */
+        case 12:  *lp++ = value32; /* Fallthrough */
+        case 11:  *lp++ = value32; /* Fallthrough */
+        case 10:  *lp++ = value32; /* Fallthrough */
+        case 9:  *lp++ = value32; /* Fallthrough */
+        case 8:  *lp++ = value32; /* Fallthrough */
+
+        case 7:  *lp++ = value32; /* Fallthrough */
+        case 6:  *lp++ = value32; /* Fallthrough */
+        case 5:  *lp++ = value32; /* Fallthrough */
+        case 4:  *lp++ = value32; /* Fallthrough */
+        case 3:  *lp++ = value32; /* Fallthrough */
+        case 2:  *lp++ = value32; /* Fallthrough */
         case 1:  *lp++ = value32;
             lcount = 0;
             break;
@@ -194,21 +194,21 @@ mem_prim_set16 (uint16_t *dp, uint32_t len, uint16_t value)
             len -= 16;
             break;
 
-        case 15:  *dp++ = value;
-        case 14:  *dp++ = value;
-        case 13:  *dp++ = value;
-        case 12:  *dp++ = value;
-        case 11:  *dp++ = value;
-        case 10:  *dp++ = value;
-        case 9:  *dp++ = value;
-        case 8:  *dp++ = value;
-
-        case 7:  *dp++ = value;
-        case 6:  *dp++ = value;
-        case 5:  *dp++ = value;
-        case 4:  *dp++ = value;
-        case 3:  *dp++ = value;
-        case 2:  *dp++ = value;
+        case 15:  *dp++ = value; /* Fallthrough */
+        case 14:  *dp++ = value; /* Fallthrough */
+        case 13:  *dp++ = value; /* Fallthrough */
+        case 12:  *dp++ = value; /* Fallthrough */
+        case 11:  *dp++ = value; /* Fallthrough */
+        case 10:  *dp++ = value; /* Fallthrough */
+        case 9:  *dp++ = value; /* Fallthrough */
+        case 8:  *dp++ = value; /* Fallthrough */
+
+        case 7:  *dp++ = value; /* Fallthrough */
+        case 6:  *dp++ = value; /* Fallthrough */
+        case 5:  *dp++ = value; /* Fallthrough */
+        case 4:  *dp++ = value; /* Fallthrough */
+        case 3:  *dp++ = value; /* Fallthrough */
+        case 2:  *dp++ = value; /* Fallthrough */
         case 1:  *dp++ = value;
             len = 0;
             break;
@@ -265,21 +265,21 @@ mem_prim_set32 (uint32_t *dp, uint32_t len, uint32_t value)
             len -= 16;
             break;
 
-        case 15:  *dp++ = value;
-        case 14:  *dp++ = value;
-        case 13:  *dp++ = value;
-        case 12:  *dp++ = value;
-        case 11:  *dp++ = value;
-        case 10:  *dp++ = value;
-        case 9:  *dp++ = value;
-        case 8:  *dp++ = value;
-
-        case 7:  *dp++ = value;
-        case 6:  *dp++ = value;
-        case 5:  *dp++ = value;
-        case 4:  *dp++ = value;
-        case 3:  *dp++ = value;
-        case 2:  *dp++ = value;
+        case 15:  *dp++ = value; /* Fallthrough */
+        case 14:  *dp++ = value; /* Fallthrough */
+        case 13:  *dp++ = value; /* Fallthrough */
+        case 12:  *dp++ = value; /* Fallthrough */
+        case 11:  *dp++ = value; /* Fallthrough */
+        case 10:  *dp++ = value; /* Fallthrough */
+        case 9:  *dp++ = value; /* Fallthrough */
+        case 8:  *dp++ = value; /* Fallthrough */
+
+        case 7:  *dp++ = value; /* Fallthrough */
+        case 6:  *dp++ = value; /* Fallthrough */
+        case 5:  *dp++ = value; /* Fallthrough */
+        case 4:  *dp++ = value; /* Fallthrough */
+        case 3:  *dp++ = value; /* Fallthrough */
+        case 2:  *dp++ = value; /* Fallthrough */
         case 1:  *dp++ = value;
             len = 0;
             break;
@@ -518,21 +518,21 @@ mem_prim_move8 (uint8_t *dp, const uint8_t *sp, uint32_t len)
                   len -= 16;
                   break;
 
-             case 15:  *dp++ = *sp++;
-             case 14:  *dp++ = *sp++;
-             case 13:  *dp++ = *sp++;
-             case 12:  *dp++ = *sp++;
-             case 11:  *dp++ = *sp++;
-             case 10:  *dp++ = *sp++;
-             case 9:  *dp++ = *sp++;
-             case 8:  *dp++ = *sp++;
-
-             case 7:  *dp++ = *sp++;
-             case 6:  *dp++ = *sp++;
-             case 5:  *dp++ = *sp++;
-             case 4:  *dp++ = *sp++;
-             case 3:  *dp++ = *sp++;
-             case 2:  *dp++ = *sp++;
+             case 15:  *dp++ = *sp++; /* Fallthrough */
+             case 14:  *dp++ = *sp++; /* Fallthrough */
+             case 13:  *dp++ = *sp++; /* Fallthrough */
+             case 12:  *dp++ = *sp++; /* Fallthrough */
+             case 11:  *dp++ = *sp++; /* Fallthrough */
+             case 10:  *dp++ = *sp++; /* Fallthrough */
+             case 9:  *dp++ = *sp++; /* Fallthrough */
+             case 8:  *dp++ = *sp++; /* Fallthrough */
+
+             case 7:  *dp++ = *sp++; /* Fallthrough */
+             case 6:  *dp++ = *sp++; /* Fallthrough */
+             case 5:  *dp++ = *sp++; /* Fallthrough */
+             case 4:  *dp++ = *sp++; /* Fallthrough */
+             case 3:  *dp++ = *sp++; /* Fallthrough */
+             case 2:  *dp++ = *sp++; /* Fallthrough */
              case 1:  *dp++ = *sp++;
                  len = 0;
                  break;
@@ -568,21 +568,21 @@ mem_prim_move8 (uint8_t *dp, const uint8_t *sp, uint32_t len)
                  len -= 16;
                  break;
 
-            case 15:  *--dp = *--sp;
-            case 14:  *--dp = *--sp;
-            case 13:  *--dp = *--sp;
-            case 12:  *--dp = *--sp;
-            case 11:  *--dp = *--sp;
-            case 10:  *--dp = *--sp;
-            case 9:  *--dp = *--sp;
-            case 8:  *--dp = *--sp;
-
-            case 7:  *--dp = *--sp;
-            case 6:  *--dp = *--sp;
-            case 5:  *--dp = *--sp;
-            case 4:  *--dp = *--sp;
-            case 3:  *--dp = *--sp;
-            case 2:  *--dp = *--sp;
+            case 15:  *--dp = *--sp; /* Fallthrough */
+            case 14:  *--dp = *--sp; /* Fallthrough */
+            case 13:  *--dp = *--sp; /* Fallthrough */
+            case 12:  *--dp = *--sp; /* Fallthrough */
+            case 11:  *--dp = *--sp; /* Fallthrough */
+            case 10:  *--dp = *--sp; /* Fallthrough */
+            case 9:  *--dp = *--sp; /* Fallthrough */
+            case 8:  *--dp = *--sp; /* Fallthrough */
+
+            case 7:  *--dp = *--sp; /* Fallthrough */
+            case 6:  *--dp = *--sp; /* Fallthrough */
+            case 5:  *--dp = *--sp; /* Fallthrough */
+            case 4:  *--dp = *--sp; /* Fallthrough */
+            case 3:  *--dp = *--sp; /* Fallthrough */
+            case 2:  *--dp = *--sp; /* Fallthrough */
             case 1:  *--dp = *--sp;
                 len = 0;
                 break;
@@ -649,21 +649,21 @@ mem_prim_move16 (uint16_t *dp, const uint16_t *sp, uint32_t len)
                   len -= 16;
                   break;
 
-             case 15:  *dp++ = *sp++;
-             case 14:  *dp++ = *sp++;
-             case 13:  *dp++ = *sp++;
-             case 12:  *dp++ = *sp++;
-             case 11:  *dp++ = *sp++;
-             case 10:  *dp++ = *sp++;
-             case 9:  *dp++ = *sp++;
-             case 8:  *dp++ = *sp++;
-
-             case 7:  *dp++ = *sp++;
-             case 6:  *dp++ = *sp++;
-             case 5:  *dp++ = *sp++;
-             case 4:  *dp++ = *sp++;
-             case 3:  *dp++ = *sp++;
-             case 2:  *dp++ = *sp++;
+             case 15:  *dp++ = *sp++; /* Fallthrough */
+             case 14:  *dp++ = *sp++; /* Fallthrough */
+             case 13:  *dp++ = *sp++; /* Fallthrough */
+             case 12:  *dp++ = *sp++; /* Fallthrough */
+             case 11:  *dp++ = *sp++; /* Fallthrough */
+             case 10:  *dp++ = *sp++; /* Fallthrough */
+             case 9:  *dp++ = *sp++; /* Fallthrough */
+             case 8:  *dp++ = *sp++; /* Fallthrough */
+
+             case 7:  *dp++ = *sp++; /* Fallthrough */
+             case 6:  *dp++ = *sp++; /* Fallthrough */
+             case 5:  *dp++ = *sp++; /* Fallthrough */
+             case 4:  *dp++ = *sp++; /* Fallthrough */
+             case 3:  *dp++ = *sp++; /* Fallthrough */
+             case 2:  *dp++ = *sp++; /* Fallthrough */
              case 1:  *dp++ = *sp++;
                  len = 0;
                  break;
@@ -698,21 +698,21 @@ mem_prim_move16 (uint16_t *dp, const uint16_t *sp, uint32_t len)
                  len -= 16;
                  break;
 
-            case 15:  *--dp = *--sp;
-            case 14:  *--dp = *--sp;
-            case 13:  *--dp = *--sp;
-            case 12:  *--dp = *--sp;
-            case 11:  *--dp = *--sp;
-            case 10:  *--dp = *--sp;
-            case 9:  *--dp = *--sp;
-            case 8:  *--dp = *--sp;
-
-            case 7:  *--dp = *--sp;
-            case 6:  *--dp = *--sp;
-            case 5:  *--dp = *--sp;
-            case 4:  *--dp = *--sp;
-            case 3:  *--dp = *--sp;
-            case 2:  *--dp = *--sp;
+            case 15:  *--dp = *--sp; /* Fallthrough */
+            case 14:  *--dp = *--sp; /* Fallthrough */
+            case 13:  *--dp = *--sp; /* Fallthrough */
+            case 12:  *--dp = *--sp; /* Fallthrough */
+            case 11:  *--dp = *--sp; /* Fallthrough */
+            case 10:  *--dp = *--sp; /* Fallthrough */
+            case 9:  *--dp = *--sp; /* Fallthrough */
+            case 8:  *--dp = *--sp; /* Fallthrough */
+
+            case 7:  *--dp = *--sp; /* Fallthrough */
+            case 6:  *--dp = *--sp; /* Fallthrough */
+            case 5:  *--dp = *--sp; /* Fallthrough */
+            case 4:  *--dp = *--sp; /* Fallthrough */
+            case 3:  *--dp = *--sp; /* Fallthrough */
+            case 2:  *--dp = *--sp; /* Fallthrough */
             case 1:  *--dp = *--sp;
                 len = 0;
                 break;
@@ -779,21 +779,21 @@ mem_prim_move32 (uint32_t *dp, const uint32_t *sp, uint32_t len)
                   len -= 16;
                   break;
 
-             case 15:  *dp++ = *sp++;
-             case 14:  *dp++ = *sp++;
-             case 13:  *dp++ = *sp++;
-             case 12:  *dp++ = *sp++;
-             case 11:  *dp++ = *sp++;
-             case 10:  *dp++ = *sp++;
-             case 9:  *dp++ = *sp++;
-             case 8:  *dp++ = *sp++;
-
-             case 7:  *dp++ = *sp++;
-             case 6:  *dp++ = *sp++;
-             case 5:  *dp++ = *sp++;
-             case 4:  *dp++ = *sp++;
-             case 3:  *dp++ = *sp++;
-             case 2:  *dp++ = *sp++;
+             case 15:  *dp++ = *sp++; /* Fallthrough */
+             case 14:  *dp++ = *sp++; /* Fallthrough */
+             case 13:  *dp++ = *sp++; /* Fallthrough */
+             case 12:  *dp++ = *sp++; /* Fallthrough */
+             case 11:  *dp++ = *sp++; /* Fallthrough */
+             case 10:  *dp++ = *sp++; /* Fallthrough */
+             case 9:  *dp++ = *sp++; /* Fallthrough */
+             case 8:  *dp++ = *sp++; /* Fallthrough */
+
+             case 7:  *dp++ = *sp++; /* Fallthrough */
+             case 6:  *dp++ = *sp++; /* Fallthrough */
+             case 5:  *dp++ = *sp++; /* Fallthrough */
+             case 4:  *dp++ = *sp++; /* Fallthrough */
+             case 3:  *dp++ = *sp++; /* Fallthrough */
+             case 2:  *dp++ = *sp++; /* Fallthrough */
              case 1:  *dp++ = *sp++;
                  len = 0;
                  break;
@@ -827,21 +827,21 @@ mem_prim_move32 (uint32_t *dp, const uint32_t *sp, uint32_t len)
                  len -= 16;
                  break;
 
-            case 15:  *--dp = *--sp;
-            case 14:  *--dp = *--sp;
-            case 13:  *--dp = *--sp;
-            case 12:  *--dp = *--sp;
-            case 11:  *--dp = *--sp;
-            case 10:  *--dp = *--sp;
-            case 9:  *--dp = *--sp;
-            case 8:  *--dp = *--sp;
-
-            case 7:  *--dp = *--sp;
-            case 6:  *--dp = *--sp;
-            case 5:  *--dp = *--sp;
-            case 4:  *--dp = *--sp;
-            case 3:  *--dp = *--sp;
-            case 2:  *--dp = *--sp;
+            case 15:  *--dp = *--sp; /* Fallthrough */
+            case 14:  *--dp = *--sp; /* Fallthrough */
+            case 13:  *--dp = *--sp; /* Fallthrough */
+            case 12:  *--dp = *--sp; /* Fallthrough */
+            case 11:  *--dp = *--sp; /* Fallthrough */
+            case 10:  *--dp = *--sp; /* Fallthrough */
+            case 9:  *--dp = *--sp; /* Fallthrough */
+            case 8:  *--dp = *--sp; /* Fallthrough */
+
+            case 7:  *--dp = *--sp; /* Fallthrough */
+            case 6:  *--dp = *--sp; /* Fallthrough */
+            case 5:  *--dp = *--sp; /* Fallthrough */
+            case 4:  *--dp = *--sp; /* Fallthrough */
+            case 3:  *--dp = *--sp; /* Fallthrough */
+            case 2:  *--dp = *--sp; /* Fallthrough */
             case 1:  *--dp = *--sp;
                 len = 0;
                 break;
diff --git a/safeclib/safe_str_constraint.h b/safeclib/safe_str_constraint.h
index a1fba3e..134401e 100644
--- a/safeclib/safe_str_constraint.h
+++ b/safeclib/safe_str_constraint.h
@@ -54,6 +54,7 @@ static inline void handle_error(char *orig_dest, rsize_t orig_dmax,
     /* null string to eliminate partial copy */
     while (orig_dmax) { *orig_dest = '\0'; orig_dmax--; orig_dest++; }
 #else
+    orig_dmax = orig_dmax;
     *orig_dest = '\0';
 #endif
 
@@ -68,6 +69,7 @@ static inline void handle_wc_error(wchar_t *orig_dest, rsize_t orig_dmax,
     /* null string to eliminate partial copy */
     while (orig_dmax) { *orig_dest = L'\0'; orig_dmax--; orig_dest++; }
 #else
+    orig_dmax = orig_dmax;
     *orig_dest = L'\0';
 #endif
 
diff --git a/safeclib/safeclib_private.h b/safeclib/safeclib_private.h
index 3967d55..cc4f160 100644
--- a/safeclib/safeclib_private.h
+++ b/safeclib/safeclib_private.h
@@ -32,6 +32,12 @@
 #ifndef __SAFECLIB_PRIVATE_H__
 #define __SAFECLIB_PRIVATE_H__
 
+#ifdef __GNUC__
+#define _UNUSED __attribute__((__unused__))
+#else
+#define _UNUSED
+#endif /* __GNUC__ */
+
 #ifdef __KERNEL__
 /* linux kernel environment */
 
diff --git a/unittests/test_strcspn_s.c b/unittests/test_strcspn_s.c
index 87fc064..283dc46 100644
--- a/unittests/test_strcspn_s.c
+++ b/unittests/test_strcspn_s.c
@@ -158,7 +158,7 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     }
 
     std_count = strcspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -286,7 +286,7 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     }
 
     std_count = strcspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -308,7 +308,7 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     }
 
     std_count = strcspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -330,7 +330,7 @@ printf("Test #%d: NULL Scan String Check\n", ++testno);
     }
 
     std_count = strcspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
diff --git a/unittests/test_strspn_s.c b/unittests/test_strspn_s.c
index 2bef05c..05098d3 100644
--- a/unittests/test_strspn_s.c
+++ b/unittests/test_strspn_s.c
@@ -206,7 +206,7 @@ int test_strspn_s (void)
     }
 
     std_count = strspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -225,7 +225,7 @@ int test_strspn_s (void)
     }
 
     std_count = strspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -245,7 +245,7 @@ int test_strspn_s (void)
     }
 
     std_count = strspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -264,7 +264,7 @@ int test_strspn_s (void)
     }
 
     std_count = strspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -283,7 +283,7 @@ int test_strspn_s (void)
     }
 
     std_count = strspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
@@ -302,7 +302,7 @@ int test_strspn_s (void)
     }
 
     std_count = strspn(str1, str2);
-    if (count != std_count) {
+    if (count != (rsize_t)std_count) {
         printf("%s %u  count=%zu  std_count=%d  rc=%d \n",
                      __FUNCTION__, __LINE__,  count, std_count, rc);
         ++errs;
diff --git a/unittests/test_wmemmove_s.c b/unittests/test_wmemmove_s.c
index d4567be..345ee6b 100644
--- a/unittests/test_wmemmove_s.c
+++ b/unittests/test_wmemmove_s.c
@@ -340,14 +340,14 @@ int test_wmemmove_s (void)
 
 		/* verify mem1 was copied properly */
 		for (i=0; i<10; i++) {
-			if (mem1[i] != i) {
+			if ((uint32_t)mem1[i] != i) {
 				printf("%d - %d m1=%d  m2=%d  \n",
 					 __LINE__, i, mem1[i], mem2[i]);
 				++errs;
 			}
 		}
 		for (i=10; i<LEN; i++) {
-			if (mem1[i] != i-10) {
+			if ((uint32_t)mem1[i] != i-10) {
 				printf("%d - %d m1=%d  should=%d  \n",
 					 __LINE__, i, mem1[i], i-10);
 				++errs;

From 060b94be743ee339d01f387c63231ce9469e5739 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 21:27:23 -0700
Subject: [PATCH 14/18] safestringlib: Function prototypes belong in a common
 header

Function prototypes belong in a common header so that there is
some check that the caller and callee are compatible. Move
extern declarations out of the .c and into the private .h.
Make them proper prototypes at the same time.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 unittests/Safe_String_UnitTestMain.c | 67 +---------------------------
 unittests/test_private.h             | 66 +++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/unittests/Safe_String_UnitTestMain.c b/unittests/Safe_String_UnitTestMain.c
index 50428fd..e40f0cc 100644
--- a/unittests/Safe_String_UnitTestMain.c
+++ b/unittests/Safe_String_UnitTestMain.c
@@ -12,72 +12,7 @@
 #include <stdlib.h>
 #include <safe_lib.h>
 #include <snprintf_s.h>
-
-extern int test_memcmp_s();
-extern int test_memcmp16_s();
-extern int test_memcmp32_s();
-extern int test_memcpy_s();
-extern int test_memcpy16_s();
-extern int test_memcpy32_s();
-extern int test_memmove_s();
-extern int test_memmove16_s();
-extern int test_memmove32_s();
-extern int test_memset_s();
-extern int test_memset16_s();
-extern int test_memset32_s();
-extern int test_memzero_s();
-extern int test_memzero16_s();
-extern int test_memzero32_s();
-extern int test_strcasecmp_s();
-extern int test_strcasestr_s();
-extern int test_strcat_s();
-extern int test_strcmp_s();
-extern int test_strcmpfld_s();
-extern int test_strcpy_s();
-extern int test_strcpyfld_s();
-extern int test_strcpyfldin_s();
-extern int test_strcpyfldout_s();
-extern int test_strcspn_s ();
-extern int test_strfirstchar_s();
-extern int test_strfirstdiff_s();
-extern int test_strfirstsame_s();
-extern int test_strisalphanumeric_s();
-extern int test_strisascii_s();
-extern int test_strisdigit_s();
-extern int test_strishex_s();
-extern int test_strislowercase_s();
-extern int test_strismixed_s();
-extern int test_strispassword_s();
-extern int test_strisuppercase_s();
-extern int test_strlastchar_s();
-extern int test_strlastdiff_s();
-extern int test_strlastsame_s();
-extern int test_strljustify_s();
-extern int test_strncat_s ();
-extern int test_strncpy_s ();
-extern int test_strnlen_s ();
-extern int test_strnterminate_s();
-extern int test_strpbrk_s ();
-extern int test_strprefix_s();
-extern int test_strremovews_s();
-extern int test_strspn_s ();
-extern int test_strstr_s ();
-extern int test_strtok_s();
-extern int test_strtolowercase_s();
-extern int test_strtouppercase_s();
-extern int test_strzero_s();
-extern int test_stpncpy_s();
-extern int test_stpcpy_s();
-extern int test_wcpcpy_s();
-extern int test_wcscat_s();
-extern int test_wcscpy_s();
-extern int test_wcsncat_s();
-extern int test_wcsncpy_s (void);
-extern int test_wcsnlen_s (void);
-extern int test_wmemcpy_s(void);
-extern int test_wmemmove_s(void);
-extern int test_wmemset_s(void);
-extern int test_wmemcmp_s(void);
+#include "test_private.h"
 
 #define TEST_FUNC(f) { #f, f }
 
diff --git a/unittests/test_private.h b/unittests/test_private.h
index ca2aa5a..294f59c 100644
--- a/unittests/test_private.h
+++ b/unittests/test_private.h
@@ -59,4 +59,70 @@
 #define debug_printf(...)
 #endif
 
+int test_memcmp_s(void);
+int test_memcmp16_s(void);
+int test_memcmp32_s(void);
+int test_memcpy_s(void);
+int test_memcpy16_s(void);
+int test_memcpy32_s(void);
+int test_memmove_s(void);
+int test_memmove16_s(void);
+int test_memmove32_s(void);
+int test_memset_s(void);
+int test_memset16_s(void);
+int test_memset32_s(void);
+int test_memzero_s(void);
+int test_memzero16_s(void);
+int test_memzero32_s(void);
+int test_strcasecmp_s(void);
+int test_strcasestr_s(void);
+int test_strcat_s(void);
+int test_strcmp_s(void);
+int test_strcmpfld_s(void);
+int test_strcpy_s(void);
+int test_strcpyfld_s(void);
+int test_strcpyfldin_s(void);
+int test_strcpyfldout_s(void);
+int test_strcspn_s(void);
+int test_strfirstchar_s(void);
+int test_strfirstdiff_s(void);
+int test_strfirstsame_s(void);
+int test_strisalphanumeric_s(void);
+int test_strisascii_s(void);
+int test_strisdigit_s(void);
+int test_strishex_s(void);
+int test_strislowercase_s(void);
+int test_strismixed_s(void);
+int test_strispassword_s(void);
+int test_strisuppercase_s(void);
+int test_strlastchar_s(void);
+int test_strlastdiff_s(void);
+int test_strlastsame_s(void);
+int test_strljustify_s(void);
+int test_strncat_s(void);
+int test_strncpy_s(void);
+int test_strnlen_s(void);
+int test_strnterminate_s(void);
+int test_strpbrk_s(void);
+int test_strprefix_s(void);
+int test_strremovews_s(void);
+int test_strspn_s(void);
+int test_strstr_s(void);
+int test_strtok_s(void);
+int test_strtolowercase_s(void);
+int test_strtouppercase_s(void);
+int test_strzero_s(void);
+int test_stpncpy_s(void);
+int test_stpcpy_s(void);
+int test_wcpcpy_s(void);
+int test_wcscat_s(void);
+int test_wcscpy_s(void);
+int test_wcsncat_s(void);
+int test_wcsncpy_s(void);
+int test_wcsnlen_s(void);
+int test_wmemcpy_s(void);
+int test_wmemmove_s(void);
+int test_wmemset_s(void);
+int test_wmemcmp_s(void);
+
 #endif /* __TEST_PRIVATE_H__ */

From 3422505052d061d966f41b7fd01b3e66efd959bb Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 5 May 2018 21:33:54 -0700
Subject: [PATCH 15/18] safestringlib: Add -Wstrict-prototypes

Add -W strict-prototypes and resolve the resulting warnings. Add
static where necessary, and convert non-prototypes into prototypes.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 makefile                    | 1 +
 safeclib/snprintf_support.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index 264f3f1..ce32cd1 100644
--- a/makefile
+++ b/makefile
@@ -3,6 +3,7 @@ MKDIR_P = mkdir -p
 CC=gcc
 CFLAGS := -I${IDIR} -fstack-protector-strong -fPIE -fPIC -O2 -MMD
 CFLAGS += -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wformat-security
+CFLAGS += -Wmissing-prototypes -Wstrict-prototypes
 LDFLAGS=-z noexecstack -z now
 
 ODIR=obj
diff --git a/safeclib/snprintf_support.c b/safeclib/snprintf_support.c
index 52a0739..a632a9c 100644
--- a/safeclib/snprintf_support.c
+++ b/safeclib/snprintf_support.c
@@ -55,7 +55,7 @@
 #define CHK_FORMAT(X,Y)   (((X)==(Y))?1:0)
 
 
-unsigned int
+static unsigned int
 parse_format(const char *format, char pformatList[], unsigned int maxFormats)
 {
 	unsigned int  numFormats = 0;
@@ -202,7 +202,7 @@ parse_format(const char *format, char pformatList[], unsigned int maxFormats)
 	return numFormats;
 }
 
-unsigned int
+static unsigned int
 check_integer_format(const char format)
 {
 	unsigned int  retValue = 0; // default failure

From 5e032ec98d27ebc080561bdacbfed80c1caf68ef Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Mon, 28 May 2018 22:03:26 -0700
Subject: [PATCH 16/18] safestringlib: Fix documentation to match
 implementation

Although the documentation describes destination buffers being
filled with 0, that is only done when SAFECLIB_STR_NULL_SLACK
is defined. Make the source documentation conditional on the
same variable. Documentation outside the source is perpetually
at risk of being different than how any particular library is
built. A such, most documentation should assume that the
clearing is not done, as that is the least risk assumption.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
---
 safeclib/stpcpy_s.c  | 9 +++++++++
 safeclib/stpncpy_s.c | 7 +++++++
 safeclib/strcat_s.c  | 7 +++++++
 safeclib/strcpy_s.c  | 9 +++++++++
 safeclib/strncpy_s.c | 6 ++++++
 safeclib/wcpcpy_s.c  | 9 +++++++++
 safeclib/wcscat_s.c  | 7 +++++++
 safeclib/wcscpy_s.c  | 9 +++++++++
 safeclib/wcsncpy_s.c | 6 ++++++
 9 files changed, 69 insertions(+)

diff --git a/safeclib/stpcpy_s.c b/safeclib/stpcpy_s.c
index e15908f..8e70f04 100644
--- a/safeclib/stpcpy_s.c
+++ b/safeclib/stpcpy_s.c
@@ -46,10 +46,14 @@
  * DESCRIPTION
  *    The stpcpy_s function copies the string pointed to by src
  *    (including the terminating null character) into the array
+#ifdef SAFECLIB_STR_NULL_SLACK
  *    pointed to by dest. All elements following the terminating
  *    null character (if any) written by stpcpy_s in the array
  *    of dmax characters pointed to by dest are nulled when
  *    strcpy_s returns. The function returns a pointer to the
+#else
+ *    pointed to by dest. The function returns a pointer to the
+#endif // SAFECLIB_STR_NULL_SLACK
  *    end of the string in dest - that is to the null terminator
  *    of dest - upon return. If an error occurs, NULL is returned
  *    and err is set to the error encountered.
@@ -88,7 +92,12 @@
  *    Copying shall not take place between objects that overlap.
  *    If there is a runtime-constraint violation, then if dest
  *       is not a null pointer and destmax is greater than zero and
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       not greater than RSIZE_MAX_STR, then stpcpy_s nulls dest.
+#else
+ *       not greater than RSIZE_MAX_STR, then stpcpy_s stores a 0
+ *       terminator in dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *   a char pointer to the terminating null at the end of dest
diff --git a/safeclib/stpncpy_s.c b/safeclib/stpncpy_s.c
index 890002d..212d116 100644
--- a/safeclib/stpncpy_s.c
+++ b/safeclib/stpncpy_s.c
@@ -47,8 +47,10 @@
  *    The stpncpy_s function copies at most smax characters from the string
  *    pointed to by src, including the terminating null byte ('\0'), to the
  *    array pointed to by dest. Exactly smax characters are written at dest.
+#ifdef SAFECLIB_STR_NULL_SLACK
  *    If the length strlen_s(src) is smaller than smax, the remaining smax
  *    characters in the array pointed to by dest are filled with null bytes.
+#endif // SAFECLIB_STR_NULL_SLACK
  *    If the length strlen_s(src) is greater than or equal to smax, the string
  *    pointed to by dest will contain smax characters from src plus a null
  *    characters (dest will be null-terminated).
@@ -97,8 +99,13 @@
  *    If src and dest overlap, copying shall be stopped; destruction of src may have occurred.
  *    If there is a runtime-constraint violation, then:
  *       if dest is not a null pointer and dmax is greater than zero and
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       not greater than RSIZE_MAX_STR, then stpncpy_s shall fill dest with nulls,
  *       if library was compiled with SAFECLIB_STR_NULL_SLACK.
+#else
+ *       not greater than RSIZE_MAX_STR, then stpncpy_s shall write a terminator
+ *       to the dest buffer.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *   a char pointer to the terminating null at the end of dest
diff --git a/safeclib/strcat_s.c b/safeclib/strcat_s.c
index 16db8a7..2eaaf64 100644
--- a/safeclib/strcat_s.c
+++ b/safeclib/strcat_s.c
@@ -62,8 +62,10 @@
  * INPUT PARAMETERS
  *    dest      pointer to string that will be extended by src
  *              if dmax allows. The string is null terminated.
+#ifdef SAFECLIB_STR_NULL_SLACK
  *              If the resulting concatenated string is less
  *              than dmax, the remaining slack space is nulled.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  *    dmax      restricted maximum length of the resulting dest,
  *              including the null
@@ -82,7 +84,12 @@
  *    Copying shall not takeplace between objects that overlap
  *    If there is a runtime-constraint violation, then if dest is
  *       not a null pointer and dmax is greater than zero and not
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       greater than RSIZE_MAX_STR, then strcat_s nulls dest.
+#else
+ *       greater than RSIZE_MAX_STR, then strcat_s writes a terminator
+ *       to dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *    EOK        successful operation, all the characters from src
diff --git a/safeclib/strcpy_s.c b/safeclib/strcpy_s.c
index 67f6f03..874c4c3 100644
--- a/safeclib/strcpy_s.c
+++ b/safeclib/strcpy_s.c
@@ -46,10 +46,14 @@
  * DESCRIPTION
  *    The strcpy_s function copies the string pointed to by src
  *    (including the terminating null character) into the array
+#ifdef SAFECLIB_STR_NULL_SLACK
  *    pointed to by dest. All elements following the terminating
  *    null character (if any) written by strcpy_s in the array
  *    of dmax characters pointed to by dest are nulled when
  *    strcpy_s returns.
+#else
+ *    pointed to by dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * SPECIFIED IN
  *    ISO/IEC TR 24731, Programming languages, environments
@@ -75,7 +79,12 @@
  *    Copying shall not take place between objects that overlap.
  *    If there is a runtime-constraint violation, then if dest
  *       is not a null pointer and destmax is greater than zero and
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       not greater than RSIZE_MAX_STR, then strcpy_s nulls dest.
+#else
+ *       not greater than RSIZE_MAX_STR, then strcpy_s writes a
+ *       terminator to dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *    EOK        successful operation, the characters in src were
diff --git a/safeclib/strncpy_s.c b/safeclib/strncpy_s.c
index 1fcdf6f..bc9d286 100644
--- a/safeclib/strncpy_s.c
+++ b/safeclib/strncpy_s.c
@@ -48,10 +48,12 @@
  *    (characters that follow a null character are not copied) from the
  *    array pointed to by src to the array pointed to by dest. If no null
  *    character was copied from src, then dest[n] is set to a null character.
+#ifdef SAFECLIB_STR_NULL_SLACK
  *
  *    All elements following the terminating null character (if any)
  *    written by strncpy_s in the array of dmax characters pointed to
  *    by dest take on the null value when strncpy_s returns.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * Specicified in:
  *    ISO/IEC TR 24731-1, Programming languages, environments
@@ -82,7 +84,11 @@
  *    Copying shall not take place between objects that overlap.
  *    If there is a runtime-constraint violation, then if dest
  *       is not a null pointer and dmax greater than RSIZE_MAX_STR,
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       then strncpy_s nulls dest.
+#else
+ *       the strncpy_s writes a terminator to dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *    EOK        successful operation, the characters in src were copied
diff --git a/safeclib/wcpcpy_s.c b/safeclib/wcpcpy_s.c
index d388dc6..e4cc9f6 100644
--- a/safeclib/wcpcpy_s.c
+++ b/safeclib/wcpcpy_s.c
@@ -47,10 +47,14 @@
  *    The wcpcpy_s function copies the wide character string pointed
  *    to by src (including the terminating null character) into the
  *    array pointed to by dest, and returns a pointer to the end of
+#ifdef SAFECLIB_STR_NULL_SLACK
  *    the wide character string. All elements following the terminating
  *    null character (if any) written by wcpcpy_s in the array of
  *    dmax characters pointed to by dest are nulled when
  *    wcpcpy_s returns.
+#else
+ *    the wide character string.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * SPECIFIED IN
  *    ISO/IEC TR 24731, Programming languages, environments
@@ -86,7 +90,12 @@
  *    Copying shall not take place between objects that overlap.
  *    If there is a runtime-constraint violation, then if dest
  *       is not a null pointer and destmax is greater than zero and
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       not greater than RSIZE_MAX_STR, then strcpy_s nulls dest.
+#else
+ *       not greater than RSIZE_MAX_STR, then strcpy_s stores a
+ *       terminator at dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *   a wchar_t pointer to the terminating null at the end of dest
diff --git a/safeclib/wcscat_s.c b/safeclib/wcscat_s.c
index 19363df..c1102b1 100644
--- a/safeclib/wcscat_s.c
+++ b/safeclib/wcscat_s.c
@@ -48,11 +48,13 @@
  *    to by src (including the terminating null character) to the
  *    end of the string pointed to by dest. The initial wide character
  *    from src overwrites the null character at the end of dest.
+#ifdef SAFECLIB_STR_NULL_SLACK
  *
  *    All elements following the terminating null character (if
  *    any) written by strcat_s in the array of dmax characters
  *    pointed to by dest take unspecified values when strcat_s
  *    returns.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * SPECIFIED IN
  *    ISO/IEC TR 24731, Programming languages, environments
@@ -82,7 +84,12 @@
  *    Copying shall not takeplace between objects that overlap
  *    If there is a runtime-constraint violation, then if dest is
  *       not a null pointer and dmax is greater than zero and not
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       greater than RSIZE_MAX_STR, then strcat_s nulls dest.
+#else
+ *       greater than RSIZE_MAX_STR, then strcat_s stores a
+ *       terminator at dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *    EOK        successful operation, all the characters from src
diff --git a/safeclib/wcscpy_s.c b/safeclib/wcscpy_s.c
index 64aad61..e620c33 100644
--- a/safeclib/wcscpy_s.c
+++ b/safeclib/wcscpy_s.c
@@ -46,10 +46,14 @@
  * DESCRIPTION
  *    The wcscpy_s function copies the wide character string pointed
  *    to by src (including the terminating null character) into the
+#ifdef SAFECLIB_STR_NULL_SLACK
  *    array pointed to by dest. All elements following the terminating
  *    null character (if any) written by strcpy_s in the array of
  *    dmax characters pointed to by dest are nulled when
  *    wcscpy_s returns.
+#else
+ *    array pointed to by dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * SPECIFIED IN
  *    ISO/IEC TR 24731, Programming languages, environments
@@ -75,7 +79,12 @@
  *    Copying shall not take place between objects that overlap.
  *    If there is a runtime-constraint violation, then if dest
  *       is not a null pointer and destmax is greater than zero and
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       not greater than RSIZE_MAX_STR, then strcpy_s nulls dest.
+#else
+ *       not greater than RSIZE_MAX_STR, then strcpy_s stores a
+ *       terminator at dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *    EOK        successful operation, the characters in src were
diff --git a/safeclib/wcsncpy_s.c b/safeclib/wcsncpy_s.c
index 67ddda1..cfa2d7b 100644
--- a/safeclib/wcsncpy_s.c
+++ b/safeclib/wcsncpy_s.c
@@ -48,6 +48,7 @@
  *    (characters that follow a null character are not copied) from the
  *    array pointed to by src to the array pointed to by dest. If no null
  *    character was copied from src, then dest[slen] is set to a null character.
+#ifdef SAFECLIB_STR_NULL_SLACK
  *
  *    All elements following the terminating null character (if any)
  *    written by wcsncpy_s in the array of dmax characters pointed to
@@ -60,6 +61,7 @@
  *    array is used multiple times to string manipulation routines in this
  *    library. If this extra security is not required, ensure that the
  *    library is compiled without #DEFINE SAFECLIB_STR_NULL_SLACK.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * Specicified in:
  *    ISO/IEC TR 24731-1, Programming languages, environments
@@ -90,7 +92,11 @@
  *    Copying shall not take place between objects that overlap.
  *    If there is a runtime-constraint violation, then if dest
  *       is not a null pointer and dmax greater than RSIZE_MAX_STR,
+#ifdef SAFECLIB_STR_NULL_SLACK
  *       then strncpy_s nulls dest.
+#else
+ *       then strncpy_s stores a terminator at dest.
+#endif // SAFECLIB_STR_NULL_SLACK
  *
  * RETURN VALUE
  *    EOK        successful operation, the characters in src were copied

From 8bf75b0574ed8cd01dd3958a4bbe468ab40ac683 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sun, 3 Jun 2018 00:18:21 -0700
Subject: [PATCH 17/18] safestringlib: Fix unit test failures with
 SAFECLIB_STR_NULL_SLACK

When SAFECLIB_STR_NULL_SLACK is defined, several unit tests
fail. Some fail because the functions misbehave, others fail
because the tests are expecting different values in the
slack buffer. Fix them all.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
 safeclib/stpcpy_s.c        | 12 +++++++++---
 safeclib/stpncpy_s.c       |  4 ++--
 safeclib/wcpcpy_s.c        |  8 ++++++--
 unittests/test_stpncpy_s.c | 28 ++++++++++++++++++++++++----
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/safeclib/stpcpy_s.c b/safeclib/stpcpy_s.c
index 8e70f04..c30b78c 100644
--- a/safeclib/stpcpy_s.c
+++ b/safeclib/stpcpy_s.c
@@ -157,7 +157,9 @@ stpcpy_s(char *dest, rsize_t dmax, const char *src, errno_t *err)
     		if (*dest == '\0') {
 #ifdef SAFECLIB_STR_NULL_SLACK
                 /* null slack to clear any data */
-    		    while (dmax) { *dest = '\0'; dmax--; dest++; }
+		    char *filler = dest;
+
+    		    while (dmax) { *filler = '\0'; dmax--; filler++; }
 #endif
     		    *err = RCNEGATE(EOK);
     		    return dest;
@@ -191,7 +193,9 @@ stpcpy_s(char *dest, rsize_t dmax, const char *src, errno_t *err)
             if (*dest == '\0') {
 #ifdef SAFECLIB_STR_NULL_SLACK
                 /* null slack to clear any data */
-                while (dmax) { *dest = '\0'; dmax--; dest++; }
+                char *filler = dest;
+
+                while (dmax) { *filler = '\0'; dmax--; filler++; }
 #endif
                 *err = RCNEGATE(EOK);
                 return dest;
@@ -219,7 +223,9 @@ stpcpy_s(char *dest, rsize_t dmax, const char *src, errno_t *err)
             if (*dest == '\0') {
 #ifdef SAFECLIB_STR_NULL_SLACK
                 /* null slack to clear any data */
-                while (dmax) { *dest = '\0'; dmax--; dest++; }
+                char *filler = dest;
+
+                while (dmax) { *filler = '\0'; dmax--; filler++; }
 #endif
                 *err = RCNEGATE(EOK);
                 return dest;
diff --git a/safeclib/stpncpy_s.c b/safeclib/stpncpy_s.c
index 212d116..a52b9d2 100644
--- a/safeclib/stpncpy_s.c
+++ b/safeclib/stpncpy_s.c
@@ -185,7 +185,7 @@ stpncpy_s(char *dest, rsize_t dmax, const char *src, rsize_t smax, errno_t *err)
 
 #ifdef SAFECLIB_STR_NULL_SLACK
     /* dmwheel1: Add check to prevent destruction of overlap into destination */
-    if ((src < dest) && ((src+dmax) >= dest)) {
+    if ((src < dest) && ((src + smax) > dest)) {
         invoke_safe_str_constraint_handler("stpncpy_s: src+dmax overlaps into dest",
                    NULL, ESOVRLP);
         *err = RCNEGATE(ESOVRLP);
@@ -193,7 +193,7 @@ stpncpy_s(char *dest, rsize_t dmax, const char *src, rsize_t smax, errno_t *err)
     }
 
     /* dmwheel1: Add check to prevent destruction of overlap into source */
-    if ((dest < src) && ((dest+dmax) >= src)) {
+    if ((dest < src) && ((dest + dmax) > src)) {
         invoke_safe_str_constraint_handler("stpncpy_s: dest+dmax overlaps into src",
                    NULL, ESOVRLP);
         *err = RCNEGATE(ESOVRLP);
diff --git a/safeclib/wcpcpy_s.c b/safeclib/wcpcpy_s.c
index e4cc9f6..aea6555 100644
--- a/safeclib/wcpcpy_s.c
+++ b/safeclib/wcpcpy_s.c
@@ -178,7 +178,9 @@ wcpcpy_s(wchar_t* dest, rsize_t dmax, const wchar_t* src, errno_t *err)
             if (*dest == L'\0') {
 #ifdef SAFECLIB_STR_NULL_SLACK
                 /* null slack to clear any data */
-                while (dmax) { *dest = L'\0'; dmax--; dest++; }
+                wchar_t *filler = dest;
+
+                while (dmax) { *filler = L'\0'; dmax--; filler++; }
 #endif
                 *err = RCNEGATE(EOK);
                 return dest; /* successful return */
@@ -204,7 +206,9 @@ wcpcpy_s(wchar_t* dest, rsize_t dmax, const wchar_t* src, errno_t *err)
             if (*dest == L'\0') {
 #ifdef SAFECLIB_STR_NULL_SLACK
                 /* null slack to clear any data */
-                while (dmax) { *dest = L'\0'; dmax--; dest++; }
+                wchar_t *filler = dest;
+
+                while (dmax) { *filler = L'\0'; dmax--; filler++; }
 #endif
                 *err = RCNEGATE(EOK);
                 return dest; /* successful return */
diff --git a/unittests/test_stpncpy_s.c b/unittests/test_stpncpy_s.c
index 77684b9..29ce345 100644
--- a/unittests/test_stpncpy_s.c
+++ b/unittests/test_stpncpy_s.c
@@ -428,7 +428,12 @@ printf("Test #%d:\n", ++testno);
         }
         /* be sure that the slack is correct */
         for (i=1; i<6; i++) {
-            if (ret[i] != 'x') {
+#ifdef SAFECLIB_STR_NULL_SLACK
+            const char slack = '\0';
+#else
+            const char slack = 'x';
+#endif // SAFECLIB_STR_NULL_SLACK
+            if (ret[i] != slack) {
                 printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                      __FUNCTION__, __LINE__,  i, rc );
                 ++errs;
@@ -473,7 +478,12 @@ printf("Test #%d:\n", ++testno);
             }
             /* be sure that the slack is correct */
             for (; i<15; i++) {
-                if (ret[i] != 'x') {
+#ifdef SAFECLIB_STR_NULL_SLACK
+                const char slack = '\0';
+#else
+                const char slack = 'x';
+#endif // SAFECLIB_STR_NULL_SLACK
+                if (ret[i] != slack) {
                     printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                          __FUNCTION__, __LINE__,  i, rc );
                     ++errs;
@@ -511,7 +521,12 @@ printf("Test #%d:\n", ++testno);
         } else {
             /* be sure that the slack is correct */
             for (i=1; i<5; i++) {
-                if (ret[i] != 'x') {
+#ifdef SAFECLIB_STR_NULL_SLACK
+                const char slack = '\0';
+#else
+                const char slack = 'x';
+#endif // SAFECLIB_STR_NULL_SLACK
+                if (ret[i] != slack) {
                     printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                          __FUNCTION__, __LINE__,  i, rc );
                     ++errs;
@@ -549,7 +564,12 @@ printf("Test #%d:\n", ++testno);
         } else {
             /* be sure that the slack is correct */
             for (i=1; i<5; i++) {
-                if (ret[i] != 'x') {
+#ifdef SAFECLIB_STR_NULL_SLACK
+                const char slack = '\0';
+#else
+                const char slack = 'x';
+#endif // SAFECLIB_STR_NULL_SLACK
+                if (ret[i] != slack) {
                     printf("%s %u Incorrect Slack at returned ptr index %d  Error rc=%u \n",
                                          __FUNCTION__, __LINE__,  i, rc );
                     ++errs;

From 30fda210bf2449ad7588cd9f073b87b38a4cb716 Mon Sep 17 00:00:00 2001
From: Mark Rustad <MRustad@gmail.com>
Date: Sat, 2 Jun 2018 12:11:59 -0700
Subject: [PATCH 18/18] safestringlib: Use order-only dependencies to create
 directories

Order-only dependencies work well for creating object
directories, so use them. Also, remove those directories
when doing a clean. Adds a missing .PHONY for the all
rule.

Signed-off-by: Mark Rustad <MRustad@gmail.com>>
---
 makefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/makefile b/makefile
index ce32cd1..d931f15 100644
--- a/makefile
+++ b/makefile
@@ -11,7 +11,8 @@ OTDIR=objtest
 SRCDIR=safeclib
 TESTDIR=unittests
 
-all: directories libsafestring.a safestringtest
+.PHONY: all
+all: libsafestring.a safestringtest
 
 _CLIB := abort_handler_s.c stpcpy_s.c strlastsame_s.c ignore_handler_s.c
 _CLIB += stpncpy_s.c strljustify_s.c memcmp16_s.c strcasecmp_s.c strncat_s.c
@@ -36,7 +37,7 @@ OBJ = $(patsubst %.c,%.o,$(_TLIST))
 CLIB =$(addprefix $(SRCDIR)/,$(_CLIB))
 
 
-${ODIR}/%.o: ${SRCDIR}/%.c
+${ODIR}/%.o: ${SRCDIR}/%.c | ${ODIR}
 	$(CC) $(LDFLAGS) -c -o $@ $< $(CFLAGS)
 
 libsafestring.a: $(OBJ)
@@ -70,18 +71,13 @@ TOBJ = $(patsubst %.c,%.o,$(_TLIST2))
 TCLIB =$(addprefix $(TESTDIR)/,$(_TESTFUNCS))
 
 
-$(OTDIR)/%.o: $(TESTDIR)/%.c $(TESTDIR)/test_private.h
+${OTDIR}/%.o: ${TESTDIR}/%.c ${TESTDIR}/test_private.h | ${OTDIR}
 	$(CC) -c -o $@ $< $(CFLAGS)
 
 
-safestringtest: directories libsafestring.a $(TOBJ)
+safestringtest: libsafestring.a $(TOBJ) | ${OTDIR}
 	$(CC) $(LDFLAGS) -o $@ $(TOBJ) libsafestring.a
 
-
-.PHONY: directories
-
-directories: ${ODIR} ${OTDIR}
-
 ${ODIR}:
 	${MKDIR_P} ${ODIR}
 
@@ -91,7 +87,8 @@ ${OTDIR}:
 .PHONY: clean
 
 clean:
-	rm -f ${ODIR}/* *~ core ${INCDIR}/*~ ${OTDIR}/*
+	rm -f *~ core ${INCDIR}/*~
+	rm -rf ${ODIR} ${OTDIR}
 	rm -f libsafestring.a
 	rm -f safestringtest