dlfcn: Remove remnants of caller sensitivity from dlinfo

[thirdparty/glibc.git] / wcsmbs / wcschr.c

diff --git a/wcsmbs/wcschr.c b/wcsmbs/wcschr.c
index 64af0bf456dddfa57ca9937f09eb2f14943080ea..6aca9bbcadf4539fdcc48597a3a29125828369fe 100644 (file)
--- a/wcsmbs/wcschr.c
+++ b/wcsmbs/wcschr.c
@@ -1,35 +1,49 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1995-2019 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.         If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include <wchar.h>
+#include <loop_unroll.h>
 
+#ifndef WCSCHR
+# define WCSCHR __wcschr
+#endif
 
-/* Find the first ocurrence of WC in WCS.  */
+/* Find the first occurrence of WC in WCS.  */
 wchar_t *
-wcschr (wcs, wc)
-     register const wchar_t *wcs;
-     register const wchar_t wc;
+WCSCHR (const wchar_t *wcs, const wchar_t wc)
 {
-  while (*wcs != L'\0')
-    if (*wcs == wc)
-      return (wchar_t *) wcs;
-    else
-      ++wcs;
+  wchar_t *dest = NULL;
 
-  return NULL;
+#define ITERATION(index)               \
+  ({                                   \
+    if (*wcs == wc)                    \
+      dest = (wchar_t*) wcs;           \
+    dest == NULL && *wcs++ != L'\0';   \
+  })
+
+#ifndef UNROLL_NTIMES
+# define UNROLL_NTIMES 1
+#endif
+
+  while (1)
+    UNROLL_REPEAT (UNROLL_NTIMES, ITERATION);
+
+  return dest;
 }
+libc_hidden_def (__wcschr)
+weak_alias (__wcschr, wcschr)
+libc_hidden_weak (wcschr)