Changeset 12885

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

Files:

• configure.ac (modified) (1 diff)
• src/db/psDB.c (modified) (7 diffs)
• src/sys/psString.h (modified) (2 diffs)
• src/sys/strcasestr.c (modified) (2 diffs)

trunk/psLib/configure.ac

@@ -84 +84 @@
 dnl check the systems endianness
 AC_C_BIGENDIAN
-
-dnl set NO_STRCASESTR if we can't find strcasestr
-AC_CHECK_FUNC([strcasestr], [], [AC_SUBST(NO_STRCASESTR, [1])])
 
 AC_PREFIX_DEFAULT([/usr/local])

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.141 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-22 22:48:34 $
+ *  @version $Revision: 1.142 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-18 19:37:31 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -1530 +1530 @@
         }
 
-        if (strcasestr(item->comment, "AUTO_INCREMENT")) {
+        if (psStrcasestr(item->comment, "AUTO_INCREMENT")) {
             psStringAppend(&query, " %s", "AUTO_INCREMENT");
         }
-        if (strcasestr(item->comment, "Unique")) {
+        if (psStrcasestr(item->comment, "Unique")) {
             psStringAppend(&query, " %s", "UNIQUE");
         }
-        if (strcasestr(item->comment, "NOT NULL")) {
+        if (psStrcasestr(item->comment, "NOT NULL")) {
             psStringAppend(&query, " %s", "NOT NULL");
         }
@@ -1554 +1554 @@
     psArray *pKeys = psArrayAllocEmpty(1);
     while ((item = psListGetAndIncrement(cursor))) {
-        if (strcasestr(item->comment, "Primary Key")) {
+        if (psStrcasestr(item->comment, "Primary Key")) {
             psArrayAdd(pKeys, 0, item->name);
         }
@@ -1576 +1576 @@
     while ((item = psListGetAndIncrement(cursor))) {
         // it's just a regular key if it matchs "Key" but not "Primary Key"
-        if (strcasestr(item->comment, "Key")
-                && (strcasestr(item->comment, "Primary Key") == NULL)) {
+        if (psStrcasestr(item->comment, "Key")
+                && (psStrcasestr(item->comment, "Primary Key") == NULL)) {
             psStringAppend(&query, ", KEY(%s)", item->name);
-        } else if (strcasestr(item->comment, "AUTO_INCREMENT")) {
+        } else if (psStrcasestr(item->comment, "AUTO_INCREMENT")) {
             // this needs to be recognized as a key if it wasn't already
             psStringAppend(&query, ", KEY(%s)", item->name);
@@ -1590 +1590 @@
     while ((item = psListGetAndIncrement(cursor))) {
         // don't compile a regex unless we have too
-        if (strcasestr(item->comment, "FKEY") == NULL) {
+        if (psStrcasestr(item->comment, "FKEY") == NULL) {
             continue;
         }
@@ -1872 +1872 @@
             psMetadataItem *mItem = NULL;
             while ((mItem = psListGetAndIncrement(mCursor))) {
-                if (mItem->comment && strcasestr(mItem->comment, "==")) {
+                if (mItem->comment && psStrcasestr(mItem->comment, "==")) {
                     logicalOp = "OR";
                     break;
@@ -2096 +2096 @@
             psStringAppend(&query, "%s IS NULL", itemName);
         } else {
-            if (item->comment && strcasestr(item->comment, "LIKE")) {
+            if (item->comment && psStrcasestr(item->comment, "LIKE")) {
                 // XXX ASC NOTE: we should have a better match for
                 // char & varchar columns than this.  LIKE is OK for

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)