diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:58 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:58 +0100 |
commit | 9853b168f68cbb09b75a817343cedde2aca4c76c (patch) | |
tree | db628840acea83dbccaf5676b89579a80e02ef51 /lib/unistr/u16-strstr.c | |
parent | d83e85a2e6064c36f6ad3c848e39d8b8c101c4f7 (diff) | |
parent | 7cf710f6587e71a193a55d84dd6d8ae1a8a69ce0 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/unistr/u16-strstr.c')
-rw-r--r-- | lib/unistr/u16-strstr.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/lib/unistr/u16-strstr.c b/lib/unistr/u16-strstr.c index 7ca7625d..8460bb46 100644 --- a/lib/unistr/u16-strstr.c +++ b/lib/unistr/u16-strstr.c @@ -1,5 +1,5 @@ /* Substring test for UTF-16 strings. - Copyright (C) 1999, 2002, 2006, 2010-2022 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2010-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software. @@ -28,18 +28,10 @@ /* Specification. */ #include "unistr.h" -#include "malloca.h" - -/* FIXME: Maybe walking the string via u16_mblen is a win? */ - #define UNIT uint16_t - -#define CANON_ELEMENT(c) c -#include "str-kmp.h" - #define FUNC u16_strstr -#define U_STRCHR u16_strchr -#define U_STRMBTOUC u16_strmbtouc -#define U_STRLEN u16_strlen -#define U_STRNLEN u16_strnlen -#include "u-strstr.h" +#define RETURN_TYPE uint16_t * +#define MEMCHR0(s, n) u16_chr (s, n, 0) +#define STRCHR u16_strchr +#define CMP_FUNC u16_cmp +#include "wcsstr-impl.h" |