From d43380d54386f464d35cd90bf7d77af7b9d4defb Mon Sep 17 00:00:00 2001 From: Alan Carvalho de Assis Date: Wed, 8 Mar 2017 13:28:50 -0600 Subject: [PATCH] Add wcstoull function --- include/cxx/cwchar | 1 + include/wchar.h | 1 + libc/wchar/Make.defs | 6 ++-- libc/wchar/lib_wcstoull.c | 61 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 libc/wchar/lib_wcstoull.c diff --git a/include/cxx/cwchar b/include/cxx/cwchar index 284a351a98..3ca4c6c1d8 100755 --- a/include/cxx/cwchar +++ b/include/cxx/cwchar @@ -116,6 +116,7 @@ namespace std using ::wcstol; using ::wcstoll; using ::wcstoul; + using ::wcstoull; using ::wcswcs; using ::wcswidth; using ::wcsxfrm; diff --git a/include/wchar.h b/include/wchar.h index 4c0e42197b..66d24ae9d7 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -225,6 +225,7 @@ long int wcstol(FAR const wchar_t *, FAR wchar_t **, int); long double wcstold(FAR const wchar_t *, FAR wchar_t **); long long int wcstoll(FAR const wchar_t *, FAR wchar_t **, int); unsigned long int wcstoul(FAR const wchar_t *, FAR wchar_t **, int); +unsigned long long int wcstoull(FAR const wchar_t *, FAR wchar_t **, int); FAR wchar_t *wcswcs(FAR const wchar_t *, FAR const wchar_t *); int wcswidth(FAR const wchar_t *, size_t); size_t wcsxfrm(wchar_t *, FAR const wchar_t *, size_t); diff --git a/libc/wchar/Make.defs b/libc/wchar/Make.defs index d3a712e3de..12c559a5ce 100644 --- a/libc/wchar/Make.defs +++ b/libc/wchar/Make.defs @@ -40,9 +40,9 @@ ifeq ($(CONFIG_LIBC_WCHAR),y) CSRCS += lib_wcscmp.c lib_wcslen.c lib_wmemchr.c lib_wmemcmp.c lib_wmemcpy.c CSRCS += lib_wmemmove.c lib_wmemset.c lib_btowc.c lib_mbrtowc.c lib_wctob.c CSRCS += lib_wcslcpy.c lib_wcsxfrm.c lib_wcrtomb.c lib_wcsftime.c -CSRCS += lib_wcscoll.c lib_wcstol.c lib_wcstoll.c lib_wcstoul.c lib_wcstold.c -CSRCS += lib_wcstof.c lib_wcstod.c lib_swprintf.c lib_mbsnrtowcs.c -CSRCS += lib_wcsnrtombs.c +CSRCS += lib_wcscoll.c lib_wcstol.c lib_wcstoll.c lib_wcstoul.c +CSRCS += lib_wcstoull.c lib_wcstold.c lib_wcstof.c lib_wcstod.c +CSRCS += lib_swprintf.c lib_mbsnrtowcs.c lib_wcsnrtombs.c # Add the wchar directory to the build diff --git a/libc/wchar/lib_wcstoull.c b/libc/wchar/lib_wcstoull.c new file mode 100644 index 0000000000..6803e5977d --- /dev/null +++ b/libc/wchar/lib_wcstoull.c @@ -0,0 +1,61 @@ +/**************************************************************************** + * libc/wchar/lib_wcstoull.c + * + * Copyright (c)1999 Citrus Project, + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#ifdef CONFIG_LIBC_WCHAR + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: wcstoull + * + * Description: + * The wcstoull() function is the wide-character equivalent of the strtoull() + * function. It converts a wchar string to unsigned long long value. + * + ****************************************************************************/ + +unsigned long long int wcstoull(FAR const wchar_t *nptr, + FAR wchar_t **endptr, int base) +{ + return strtoull((FAR const char *)nptr, (FAR char **)endptr, base); +} + +#endif /* CONFIG_LIBC_WCHAR */