X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fstrtox_main.c;h=3bfdbb8b5bf2d857dfff5c7ecda9ceafad88f041;hb=2040228f27d623585d339dec175c4e779ca9edb5;hp=fbdf8bbfad27a3fab8124eafa84937602c906ff9;hpb=f93d55176e4db9edfb1840054169003bcca4d1fb;p=pdclib

diff --git a/functions/_PDCLIB/strtox_main.c b/functions/_PDCLIB/strtox_main.c
index fbdf8bb..3bfdbb8 100644
--- a/functions/_PDCLIB/strtox_main.c
+++ b/functions/_PDCLIB/strtox_main.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /* _PDCLIB_strtox_main( const char * *, int, _PDCLIB_uintmax_t, _PDCLIB_uintmax_t, int )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#define _PDCLIB_INT_H _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
 #include <stdint.h>
 
+#ifndef REGTEST
+
 _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, uintmax_t error, uintmax_t limval, int limdigit, char * sign )
 {
     _PDCLIB_uintmax_t rc = 0;
@@ -23,7 +21,7 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, uintm
         digit = x - _PDCLIB_digits;
         if ( ( rc < limval ) || ( ( rc == limval ) && ( digit <= limdigit ) ) )
         {
-            rc = rc * base + digit;
+            rc = rc * base + (unsigned)digit;
             ++(*p);
         }
         else
@@ -45,12 +43,15 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, uintm
     return rc;
 }
 
+#endif
+
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 #include <errno.h>
 
 int main( void )
 {
+#ifndef REGTEST
     const char * p;
     char test[] = "123_";
     char fail[] = "xxx";
@@ -78,6 +79,7 @@ int main( void )
     sign = '-';
     TESTCASE( _PDCLIB_strtox_main( &p, 10u, (uintmax_t)999, (uintmax_t)99, 8, &sign ) == 0 );
     TESTCASE( p == NULL );
+#endif
     return TEST_RESULTS;
 }