X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fstrtox_main.c;h=86b6d42e18c4f05470a9f06c258de965b200dcf5;hb=219271fd548949abce8bd75c34dd42e519418fc4;hp=fbdf8bbfad27a3fab8124eafa84937602c906ff9;hpb=f93d55176e4db9edfb1840054169003bcca4d1fb;p=pdclib diff --git a/functions/_PDCLIB/strtox_main.c b/functions/_PDCLIB/strtox_main.c index fbdf8bb..86b6d42 100644 --- a/functions/_PDCLIB/strtox_main.c +++ b/functions/_PDCLIB/strtox_main.c @@ -6,13 +6,13 @@ Permission is granted to use, modify, and / or redistribute at will. */ -#define _PDCLIB_INT_H _PDCLIB_INT_H -#include <_PDCLIB_int.h> #include #include #include #include +#ifndef REGTEST +#include <_PDCLIB_int.h> _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 +23,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 @@ -44,6 +44,7 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, uintm } return rc; } +#endif #ifdef TEST #include <_PDCLIB_test.h> @@ -51,6 +52,7 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, uintm int main( void ) { +#ifndef REGTEST const char * p; char test[] = "123_"; char fail[] = "xxx"; @@ -78,6 +80,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; }