Some cleanups.

[pdclib] / functions / string / strncpy.c

diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c
index 2fb3f000e947a179ee77e5f279cfd23acb1974dd..efb6480468391a0bf35fae0e8001bee7d0d5c1d9 100644 (file)
--- a/functions/string/strncpy.c
+++ b/functions/string/strncpy.c
@@ -8,9 +8,6 @@
 
 #include <string.h>
 
-/* TODO: Debuggung only */
-#include <stdio.h>
-
 #ifndef REGTEST
 
 char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
@@ -19,19 +16,15 @@ char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
     while ( ( n > 0 ) && ( *s1++ = *s2++ ) )
     {
         /* Cannot do "n--" in the conditional as size_t is unsigned and we have
-           to check it again for >0 in the next loop.
+           to check it again for >0 in the next loop below, so we must not risk
+           underflow.
         */
         --n;
     }
-    /* TODO: This works correctly, but somehow the handling of n is ugly as
-       hell.
-    */
-    if ( n > 0 )
+    /* Checking against 1 as we missed the last --n in the loop above. */
+    while ( n-- > 1 )
     {
-        while ( --n )
-        {
-            *s1++ = '\0';
-        }
+        *s1++ = '\0';
     }
     return rc;
 }