JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2001-10-01 Charles Wilson <cwilson@ece.gatech.edu>

Browse Source 
* libc/include/stdlib.h: add declarations for
        _strtoull_r, _strtoll_r, strtoull, and strtoll.
        * libc/stdio/local.h: remove declarations of
        __strtoull_r and __strtoll_r.
        * libc/stdio/vfscanf.c(__svfscanf_r): call
        _strtoull_r instead of __strtoull_r. Ditto
        _strtoll_r vs. __strtoll_r.
        * libc/stdlib/Makefile.am: add new files to
        .c list and .def list
        * libc/stdlib/Makefile.in: regenerate
        * libc/stdlib/strtoll_r.c: rename __strtoll_r
        as _strtoll_r
        * libc/stdlib/strtoull_r.c: rename __strtoull_r
        as _strtoull_r
        * libc/stdlib/strtoull.c: new file
        * libc/stdlib/strtoll.c: new file
This commit is contained in:
Jeff Johnston
2001-10-01 18:05:11 +00:00
parent 47063f00e4
commit 5665b0e1d0
10 changed files with 325 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/libc/stdio/local.h
View File

@ -86,12 +86,6 @@ char *_EXFUN(_licvt,(char *, long, char));
char *_EXFUN(_llicvt,(char *, long long, char));
#endif
/* The following are found in the stdlib directory, not here */
#ifdef __GNUC__
long long _EXFUN(__strtoll_r,(struct _reent *, const char *, char **, int));
unsigned long long _EXFUN(__strtoull_r,(struct _reent *, const char *, char **, int));
#endif
#define CVT_BUF_SIZE 128
#define NDYNAMIC 4 /* add four more whenever necessary */

4
newlib/libc/stdio/vfscanf.c
View File

@ -822,9 +822,9 @@ __svfscanf_r (rptr, fp, fmt0, ap)
{
u_long_long resll;
if (ccfn == _strtoul_r)
resll = __strtoull_r (rptr, buf, (char **) NULL, base);
resll = _strtoull_r (rptr, buf, (char **) NULL, base);
else
resll = __strtoll_r (rptr, buf, (char **) NULL, base);
resll = _strtoll_r (rptr, buf, (char **) NULL, base);
llp = va_arg (ap, long long*);
*llp = resll;
}