From 1e39441089946b5dc69c79daf8ed816ff6ba6194 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 1 Sep 2015 00:23:23 +0200 Subject: add string/array comparision functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- include/string.h | 44 ++++++++++++++++++++++++++++++++++ include/strings.h | 36 +++++++++++++++++++++++++++- include/wchar.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/string.h b/include/string.h index 0a41899..604fe1a 100644 --- a/include/string.h +++ b/include/string.h @@ -116,6 +116,7 @@ char* __gnu_strerror_r(int, char*, size_t); /* GNU-specific strerror_r */ #endif + /** * Returns the number of bytes in a NUL-terminated * string. This excludes the NUL byte. @@ -705,5 +706,48 @@ void* memdup(const void*, size_t) +/** + * Compare two memory segments alphabetically in a case sensitive manner. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @param size The size of the segments. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int memcmp(const void*, const void*, size_t) + __GCC_ONLY(__attribute__((warn_unused_result))); + +/** + * Compare two strings alphabetically in a case sensitive manner. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int strcmp(const char*, const char*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * Compare two strings alphabetically in a case sensitive manner. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @param length The maximum number of characters to compare. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int strncmp(const char*, const char*, size_t) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + + +#if defined(_GNU_SOURCE) && !defined(__PORTABLE) +int strverscmp(const char*, const char*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); /* TODO document and implement strverscmp */ +#end if + + + #endif diff --git a/include/strings.h b/include/strings.h index 0a4bc5e..15b8b1a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -23,7 +23,6 @@ #define __NEED_size_t - #include @@ -60,6 +59,41 @@ void explicit_bzero(void*, size_t); void bcopy(const void*, void*, size_t) __deprecated("Use 'memmove', or similar function, instead, but be aware of reordered paramters."); +/** + * This function is identical to `memcmp`. + */ +int bcmp(const void*, const void*, size_t) + __deprecated("Use 'memcmp' instead.") + __GCC_ONLY(__attribute__((warn_unused_result))); + + +/** + * Compare two strings alphabetically in a case insensitive manner. + * Be aware, only ASCII characters are case insensitive, non-ASCII + * characters are case sensitive. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int strcasecmp(const char*, const char*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * Compare two strings alphabetically in a case insensitive manner. + * Be aware, only ASCII characters are case insensitive, non-ASCII + * characters are case sensitive. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @param length The maximum number of characters to compare. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int strncasecmp(const char*, const char*, size_t) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + #endif diff --git a/include/wchar.h b/include/wchar.h index 34c066e..1b44690 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -631,6 +631,78 @@ wchar_t* wmemdup(const wchar_t*, size_t) +/** + * Compare two memory segments alphabetically in a case sensitive manner. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @param size The size of the segments. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int wmemcmp(const wchar_t*, const wchar_t*, size_t) + __GCC_ONLY(__attribute__((warn_unused_result))); + +/** + * Compare two strings alphabetically in a case sensitive manner. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int wcscmp(const wchar_t*, const wchar_t*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +#if (defined(_GNU_SOURCE) || defined(_SLIBC_SOURCE)) && !defined(__PORTABLE) +/** + * Compare two strings alphabetically in a case insensitive manner. + * Be aware, only ASCII characters are case insensitive, non-ASCII + * characters are case sensitive. + * + * This is a GNU-compliant slibc extension. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int wcscasecmp(const wchar_t*, const wchar_t*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * Compare two strings alphabetically in a case sensitive manner. + * + * This is a GNU-compliant slibc extension. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @param length The maximum number of characters to compare. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int wcsncmp(const wchar_t*, const wchar_t*, size_t) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * Compare two strings alphabetically in a case insensitive manner. + * Be aware, only ASCII characters are case insensitive, non-ASCII + * characters are case sensitive. + * + * This is a GNU-compliant slibc extension. + * + * @param a A negetive value is returned if this is the lesser. + * @param b A positive value is returned if this is the lesser. + * @param length The maximum number of characters to compare. + * @return Zero is returned if `a` and `b` are equal, otherwise, + * see the specifications for `a` and `b`. + */ +int wcsncasecmp(const wchar_t*, const wchar_t*, size_t) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); +#endif + + + #endif #endif -- cgit v1.2.3-70-g09d2