std_cstring.h (memchr): Correct definitions.

2001-05-08  Benjamin Kosnik  <bkoz@fillmore.constant.com>

	* include/c_std/bits/std_cstring.h (memchr): Correct definitions.
	(strchr): Same.
	(strpbrk): Same.
	(strrchr): Same.
	(strstr): Same.
	* include/c_std/bits/std_cwchar.h (wcschr): Same.
	(wcsbrk): Same.
	(wcsrchr): Same.
	(wcsstr): Same.
	(wmemchr): Same.
	* testsuite/21_strings/c_strings.cc: Add tests.

From-SVN: r41919

4 files changed, 110 insertions, 41 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 13d9b06..7026644 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2001-05-08  Benjamin Kosnik  <bkoz@fillmore.constant.com>
+
+	* include/c_std/bits/std_cstring.h (memchr): Correct definitions.
+	(strchr): Same.
+	(strpbrk): Same.
+	(strrchr): Same.
+	(strstr): Same.
+	* include/c_std/bits/std_cwchar.h (wcschr): Same.
+	(wcsbrk): Same.
+	(wcsrchr): Same.
+	(wcsstr): Same.
+	(wmemchr): Same.
+	* testsuite/21_strings/c_strings.cc: Add tests.
+	
 2001-05-07  Benjamin Kosnik  <bkoz@redhat.com>
 
 	libstdc++/2523
diff --git a/libstdc++-v3/include/c_std/bits/std_cstring.h b/libstdc++-v3/include/c_std/bits/std_cstring.h
index 52b4902..0134eb2 100644
--- a/libstdc++-v3/include/c_std/bits/std_cstring.h
+++ b/libstdc++-v3/include/c_std/bits/std_cstring.h
@@ -79,38 +79,51 @@ namespace std
   extern "C" int strcoll(const char*, const char*); 
   extern "C" int strncmp(const char*, const char*, size_t); 
   extern "C" size_t strxfrm(char*, const char*, size_t); 
-  extern "C" const void* memchr(const void*, int, size_t); 
+
+  inline const void*
+  memchr(const void* __p, int __c, size_t __n)
+  { return const_cast<const void*>(::memchr(__p, __c, __n)); }
+
   inline void*
   memchr(void* __p, int __c, size_t __n)
-  {
-    return const_cast<void*>(memchr(const_cast<const void*>(__p), __c, __n));
-  }
-  extern "C" const char* strchr(const char*, int); 
+  { return ::memchr(const_cast<const void*>(__p), __c, __n); }
+
+  inline const char*
+  strchr(const char* __s1, int __n)
+  { return const_cast<const char*>(::strchr(__s1, __n)); }
+
   inline char*
   strchr(char* __s1, int __n)
-  {
-    return const_cast<char*>(strchr(const_cast<const char*>(__s1), __n));
-  }
+  { return ::strchr(const_cast<const char*>(__s1), __n); }
+
   extern "C" size_t strcspn(const char*, const char*); 
-  extern "C" const char* strpbrk(const char*, const char*); 
+
+  inline const char*
+  strpbrk(const char* __s1, const char* __s2)
+  { return const_cast<char*>(::strpbrk(__s1, __s2)); }
+
   inline char*
   strpbrk(char* __s1, const char* __s2)
-  {
-    return const_cast<char*>(strpbrk(const_cast<const char*>(__s1), __s2));
-  }
-  extern "C" const char* strrchr(const char*, int); 
+  { return ::strpbrk(const_cast<const char*>(__s1), __s2); }
+
+  inline const char*
+  strrchr(const char* __s1, int __n)
+  { return const_cast<char*>(::strrchr(__s1, __n)); }
+
   inline char*
   strrchr(char* __s1, int __n)
-  {
-    return const_cast<char*>(strrchr(const_cast<const char*>(__s1), __n));
-  }
+  { return ::strrchr(const_cast<const char*>(__s1), __n); }
+
   extern "C" size_t strspn(const char*, const char*); 
-  extern "C" const char* strstr(const char*, const char*); 
+
+  inline const char*
+  strstr(const char* __s1, const char* __s2)
+  { return const_cast<char*>(::strstr(__s1, __s2)); }
+
   inline char*
   strstr(char* __s1, const char* __s2)
-  {
-    return const_cast<char*>(strstr(const_cast<const char*>(__s1), __s2));
-  }
+  { return ::strstr(const_cast<const char*>(__s1), __s2); }
+
   extern "C" char* strtok(char*, const char*); 
   extern "C" void* memset(void*, int, size_t); 
   extern "C" char* strerror(int); 
diff --git a/libstdc++-v3/include/c_std/bits/std_cwchar.h b/libstdc++-v3/include/c_std/bits/std_cwchar.h
index 0919ab0..2765935 100644
--- a/libstdc++-v3/include/c_std/bits/std_cwchar.h
+++ b/libstdc++-v3/include/c_std/bits/std_cwchar.h
@@ -156,40 +156,54 @@ namespace std
   extern "C" int wcscoll(const wchar_t*, const wchar_t*); 
   extern "C" int wcsncmp(const wchar_t*, const wchar_t*, size_t); 
   extern "C" size_t wcsxfrm(wchar_t*, const wchar_t*, size_t); 
-  extern "C" const wchar_t* wcschr(const wchar_t*, wchar_t); 
+
+  inline const wchar_t*
+  wcschr(const wchar_t* __p, wchar_t __c)
+  { return const_cast<const wchar_t*>(::wcschr(__p, __c)); }
+
   inline wchar_t*
   wcschr(wchar_t* __p, wchar_t __c)
-  {
-    return const_cast<wchar_t*>(wcschr(const_cast<const wchar_t*>(__p), __c));
-  }
+  { return ::wcschr(const_cast<const wchar_t*>(__p), __c); }
+
   extern "C" size_t wcscspn(const wchar_t*, const wchar_t*); 
   extern "C" size_t wcslen(const wchar_t*); 
-  extern "C" const wchar_t* wcspbrk(const wchar_t*, const wchar_t*); 
+
+  inline const wchar_t*
+  wcspbrk(const wchar_t* __s1, wchar_t* __s2)
+  { return const_cast<const wchar_t*>(::wcspbrk(__s1, __s2)); }
+
   inline wchar_t*
   wcspbrk(wchar_t* __s1, wchar_t* __s2)
-  {
-    return const_cast<wchar_t*>(wcspbrk(const_cast<const wchar_t*>(__s1), __s2));
-  }
-  extern "C" const wchar_t* wcsrchr(const wchar_t*, wchar_t); 
+  { return ::wcspbrk(const_cast<const wchar_t*>(__s1), __s2); }
+
+  inline const wchar_t*
+  wcsrchr(const wchar_t* __p, wchar_t __c)
+  { return const_cast<const wchar_t*>(::wcsrchr(__p, __c)); }
+
   inline wchar_t*
   wcsrchr(wchar_t* __p, wchar_t __c)
-  {
-    return const_cast<wchar_t*>(wcsrchr(const_cast<const wchar_t*>(__p), __c));
-  }
+  { return ::wcsrchr(const_cast<const wchar_t*>(__p), __c); }
+
   extern "C" size_t wcsspn(const wchar_t*, const wchar_t*); 
-  extern "C" const wchar_t* wcsstr(const wchar_t*, const wchar_t*); 
+
+  inline const wchar_t*
+  wcsstr(const wchar_t* __s1, wchar_t* __s2)
+  { return const_cast<const wchar_t*>(::wcsstr(__s1, __s2)); }
+
   inline wchar_t*
   wcsstr(wchar_t* __s1, wchar_t* __s2)
-  {
-    return const_cast<wchar_t*>(wcsstr(const_cast<const wchar_t*>(__s1), __s2));
-  }
+  { return ::wcsstr(const_cast<const wchar_t*>(__s1), __s2); }
+
   extern "C" wchar_t* wcstok(wchar_t*, const wchar_t*, wchar_t**); 
-  extern "C" const wchar_t* wmemchr(const wchar_t*, wchar_t, size_t);
+
+  inline const wchar_t*
+  wmemchr(const wchar_t* __p, wchar_t __c, size_t __n)
+  { return const_cast<wchar_t*>(::wmemchr(__p, __c, __n)); }
+
   inline wchar_t*
   wmemchr(wchar_t* __p, wchar_t __c, size_t __n)
-  {
-    return const_cast<wchar_t*>(wmemchr(const_cast<const wchar_t*>(__p), __c, __n));
-  }
+  { return ::wmemchr(const_cast<const wchar_t*>(__p), __c, __n); }
+
   extern "C" int wmemcmp(const wchar_t*, const wchar_t*, size_t); 
   extern "C" wchar_t* wmemcpy(wchar_t*, const wchar_t*, size_t); 
   extern "C" wchar_t* wmemmove(wchar_t*, const wchar_t*, size_t); 
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings.cc b/libstdc++-v3/testsuite/21_strings/c_strings.cc
index 49b73f2..e8536b7 100644
--- a/libstdc++-v3/testsuite/21_strings/c_strings.cc
+++ b/libstdc++-v3/testsuite/21_strings/c_strings.cc
@@ -24,7 +24,7 @@
 #include <cstring>
 #include <cwchar>
 
-int main()
+void test01()
 {
   bool test = true;
   char c = 'a';
@@ -62,6 +62,34 @@ int main()
   // void* memchr(      void* s, int c, size_t n);
   cv = std::memchr(cv, 'a', 3);
   v = std::memchr(v, 'a', 3);
+}
+
+void test02()
+{
+  using namespace std;
+
+  const char* ccarray1 = "san francisco roof garden inspectors";
+  const char* ccarray2 = "san francisco sunny-day park inspectors";
+  char carray[30];
+  strcpy(carray, ccarray1);
+  void* v;
+  const void* cv;
+ 
+  memchr(cv, '/', 3);
+  strchr(ccarray1, '/');
+  strpbrk(ccarray1, ccarray2);
+  strrchr(ccarray1, 'c');
+  strstr(carray, carray);
+}
+
+int main()
+{
+  test01();
+  test02();
 
   return 0;
 }
+
+
+
+