Changeset 12885 for trunk/psLib/src/sys

Timestamp:

Apr 18, 2007, 9:37:31 AM (19 years ago)

Author:

rhl

Message:

strcasestr isn't in posix (and is in C namespace). Use psStrcasestr

Location:

trunk/psLib/src/sys

Files:

• psString.h (modified) (2 diffs)
• strcasestr.c (modified) (2 diffs)

trunk/psLib/src/sys/psString.h

@@ -11 +11 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-21 21:37:58 $
+ * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-04-18 19:37:08 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -309 +309 @@
 }
 
-#ifndef DOXYGEN
-#if NO_STRCASESTR
-// this means that the system's libc does not provide strcasestr()
-#define strcasestr(...) p_psstrcasestr(__VA_ARGS__)
-extern char *p_psstrcasestr (const char *haystack, const char *needle)
-    __THROW __attribute_pure__ __nonnull ((1, 2));
-#endif // if NO_STRCASESTR
-#endif // ifndef DOXYGEN
-
+char *psStrcasestr (const char *haystack, const char *needle);
 
 /// @}

trunk/psLib/src/sys/strcasestr.c

@@ -49 +49 @@
 #undef __strcasestr
 
-// was named __strcasestr (phaystack, pneedle)
 char *
-p_psstrcasestr (phaystack, pneedle)
-const char *phaystack;
-const char *pneedle;
+psStrcasestr(const char *phaystack,
+             const char *pneedle)
 {
     register const unsigned char *haystack, *needle;
@@ -134 +132 @@
     return 0;
 }
-
-//weak_alias (__strcasestr, strcasestr)