Changeset 12885 for trunk/psLib/src/db/psDB.c

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

File:

• trunk/psLib/src/db/psDB.c (modified) (7 diffs)

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