diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/util/StringAPI.hxx | 4 | ||||
| -rw-r--r-- | src/util/WStringAPI.hxx | 134 |
3 files changed, 139 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ca26bcae1..7ea92f1ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -379,6 +379,7 @@ libutil_a_SOURCES = \ src/util/NumberParser.hxx \ src/util/StringUtil.cxx src/util/StringUtil.hxx \ src/util/StringAPI.hxx \ + src/util/WStringAPI.hxx \ src/util/DivideString.cxx src/util/DivideString.hxx \ src/util/SplitString.cxx src/util/SplitString.hxx \ src/util/FormatString.cxx src/util/FormatString.hxx \ diff --git a/src/util/StringAPI.hxx b/src/util/StringAPI.hxx index c02055437..203bd675a 100644 --- a/src/util/StringAPI.hxx +++ b/src/util/StringAPI.hxx @@ -34,6 +34,10 @@ #include <string.h> +#ifdef _UNICODE +#include "WStringAPI.hxx" +#endif + gcc_pure gcc_nonnull_all static inline size_t StringLength(const char *p) diff --git a/src/util/WStringAPI.hxx b/src/util/WStringAPI.hxx new file mode 100644 index 000000000..59ee980f4 --- /dev/null +++ b/src/util/WStringAPI.hxx @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2010-2015 Max Kellermann <max@duempel.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - 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 COPYRIGHT HOLDERS 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 + * FOUNDATION 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. + */ + +#ifndef WSTRING_API_HXX +#define WSTRING_API_HXX + +#include "Compiler.h" + +#include <wchar.h> + +gcc_pure gcc_nonnull_all +static inline size_t +StringLength(const wchar_t *p) +{ + return wcslen(p); +} + +gcc_pure gcc_nonnull_all +static inline const wchar_t * +StringFind(const wchar_t *haystack, const wchar_t *needle) +{ + return wcsstr(haystack, needle); +} + +gcc_pure gcc_nonnull_all +static inline const wchar_t * +StringFind(const wchar_t *haystack, wchar_t needle, size_t size) +{ + return wmemchr(haystack, needle, size); +} + +gcc_pure gcc_nonnull_all +static inline wchar_t * +StringFind(wchar_t *haystack, wchar_t needle, size_t size) +{ + return wmemchr(haystack, needle, size); +} + +gcc_pure gcc_nonnull_all +static inline const wchar_t * +StringFind(const wchar_t *haystack, wchar_t needle) +{ + return wcschr(haystack, needle); +} + +gcc_pure gcc_nonnull_all +static inline wchar_t * +StringFind(wchar_t *haystack, wchar_t needle) +{ + return wcschr(haystack, needle); +} + +gcc_pure gcc_nonnull_all +static inline const wchar_t * +StringFindLast(const wchar_t *haystack, wchar_t needle) +{ + return wcsrchr(haystack, needle); +} + +gcc_pure gcc_nonnull_all +static inline wchar_t * +StringFindLast(wchar_t *haystack, wchar_t needle) +{ + return wcsrchr(haystack, needle); +} + +gcc_nonnull_all +static inline void +UnsafeCopyString(wchar_t *dest, const wchar_t *src) +{ + wcscpy(dest, src); +} + +/** + * Checks whether str1 and str2 are equal. + * @param str1 String 1 + * @param str2 String 2 + * @return True if equal, False otherwise + */ +gcc_pure gcc_nonnull_all +static inline bool +StringIsEqual(const wchar_t *str1, const wchar_t *str2) +{ + return wcscmp(str1, str2) == 0; +} + +/** + * Checks whether #a and #b are equal. + */ +gcc_pure gcc_nonnull_all +static inline bool +StringIsEqual(const wchar_t *a, const wchar_t *b, size_t length) +{ + return wcsncmp(a, b, length) == 0; +} + +#ifndef __BIONIC__ + +gcc_malloc gcc_nonnull_all +static inline wchar_t * +DuplicateString(const wchar_t *p) +{ + return wcsdup(p); +} + +#endif + +#endif |