X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fstrtox_main.c;h=59534d83809c3e00ef87116a6afed3e2da77c826;hb=12e17136786afb1775c9dc946cbe41f5e230c24a;hp=6ab56cd2d5322011e61a78e016f3861b7fbdd927;hpb=f66fc2a4fc1b45e0aa357f2dd0e45ddd1b7c9142;p=pdclib.old

diff --git a/functions/_PDCLIB/strtox_main.c b/functions/_PDCLIB/strtox_main.c
index 6ab56cd..59534d8 100644
--- a/functions/_PDCLIB/strtox_main.c
+++ b/functions/_PDCLIB/strtox_main.c
@@ -8,12 +8,14 @@
    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>
 
-_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, int limdigit )
+_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, uintmax_t error, uintmax_t limval, uintmax_t limdigit, char * sign )
 {
     _PDCLIB_uintmax_t rc = 0;
     int digit = -1;
@@ -29,8 +31,10 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, int base, _PDCLIB_uintma
         else
         {
             errno = ERANGE;
-            /* TODO: Only if endptr != NULL */
+            /* TODO: Only if endptr != NULL - but do we really want *another* parameter? */
             while ( memchr( _PDCLIB_digits, **p, base ) != NULL ) ++(*p);
+            /* TODO: This is ugly, but keeps caller from negating the error value */
+            *sign = '+';
             return error;
         }
     }
@@ -46,32 +50,34 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, int base, _PDCLIB_uintma
 #include <_PDCLIB_test.h>
 #include <errno.h>
 
-int main()
+int main( void )
 {
     const char * p;
     char test[] = "123_";
     char fail[] = "xxx";
-    BEGIN_TESTS;
+    char sign = '-';
     /* basic functionality */
     p = test;
     errno = 0;
-    TESTCASE( _PDCLIB_strtox_main( &p, 10, 999, 12, 3 ) == 123 );
+    TESTCASE( _PDCLIB_strtox_main( &p, 10u, (uintmax_t)999, (uintmax_t)12, (uintmax_t)3, &sign ) == 123 );
     TESTCASE( errno == 0 );
     TESTCASE( p == &test[3] );
     /* proper functioning to smaller base */
     p = test;
-    TESTCASE( _PDCLIB_strtox_main( &p, 8, 999, 12, 3 ) == 0123 );
+    TESTCASE( _PDCLIB_strtox_main( &p, 8u, (uintmax_t)999, (uintmax_t)12, (uintmax_t)3, &sign ) == 0123 );
     TESTCASE( errno == 0 );
     TESTCASE( p == &test[3] );
     /* overflowing subject sequence must still return proper endptr */
     p = test;
-    TESTCASE( _PDCLIB_strtox_main( &p, 4, 999, 1, 2 ) == 999 );
+    TESTCASE( _PDCLIB_strtox_main( &p, 4u, (uintmax_t)999, (uintmax_t)1, (uintmax_t)2, &sign ) == 999 );
     TESTCASE( errno == ERANGE );
     TESTCASE( p == &test[3] );
+    TESTCASE( sign == '+' );
     /* testing conversion failure */
     errno = 0;
     p = fail;
-    TESTCASE( _PDCLIB_strtox_main( &p, 10, 999, 99, 8 ) == 0 );
+    sign = '-';
+    TESTCASE( _PDCLIB_strtox_main( &p, 10u, (uintmax_t)999, (uintmax_t)99, (uintmax_t)8, &sign ) == 0 );
     TESTCASE( p == NULL );
     return TEST_RESULTS;
 }