From 00893e79fc62966067af1a106567db96bd170338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 3 Mar 2024 19:11:32 +0100 Subject: New upstream version 1.2 --- lib/unistr/u16-strstr.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'lib/unistr/u16-strstr.c') 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 , 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" -- cgit v1.2.3