Changeset 3574 for trunk/kStuff/kLdr/kLdrDyldFind.c

Timestamp:

Sep 2, 2007, 9:30:58 PM (18 years ago)

Author:

bird

Message:

Generic kHlpString.h implementation.

File:

• trunk/kStuff/kLdr/kLdrDyldFind.c (modified) (4 diffs)

trunk/kStuff/kLdr/kLdrDyldFind.c

@@ -841 +841 @@
             &&  (   fCaseSensitive
                  ?  !kHlpMemComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix)
-                 :  !kHlpMemIComp(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix))
+                 :  !kHlpMemICompAscii(pszName + cchName - cchSuffix, *ppszSuffix, cchSuffix))
            )
             *ppszSuffix = NULL;
@@ -943 +943 @@
             const unsigned fNameHasSuffix = pszNameSuffix
                                          && kHlpStrLen(pszNameSuffix) == cchSuffix
-                                         && !kHlpMemIComp(pszNameSuffix, pszName + cchName - cchSuffix, cchSuffix);
+                                         && !kHlpMemICompAscii(pszNameSuffix, pszName + cchName - cchSuffix, cchSuffix);
             for (; pCur; pCur = pCur->Load.pNext)
             {
@@ -953 +953 @@
                 /* match name */
                 if (    pCur->pMod->cchName == cchName
-                    &&  !kHlpMemIComp(pCur->pMod->pszName, pszName, cchName))
+                    &&  !kHlpMemICompAscii(pCur->pMod->pszName, pszName, cchName))
                     break;
                 if (cchPrefix)
                 {
                     if (    pCur->pMod->cchName == cchName + cchPrefix
-                        &&  !kHlpMemIComp(pCur->pMod->pszName, pszPrefix, cchPrefix)
-                        &&  !kHlpMemIComp(pCur->pMod->pszName + cchPrefix, pszName, cchName))
+                        &&  !kHlpMemICompAscii(pCur->pMod->pszName, pszPrefix, cchPrefix)
+                        &&  !kHlpMemICompAscii(pCur->pMod->pszName + cchPrefix, pszName, cchName))
                     break;
                 }
@@ -965 +965 @@
                 {
                     if (    pCur->pMod->cchName == cchName + cchSuffix
-                        &&  !kHlpMemIComp(pCur->pMod->pszName + cchName, pszSuffix, cchSuffix)
-                        &&  !kHlpMemIComp(pCur->pMod->pszName, pszName, cchName))
+                        &&  !kHlpMemICompAscii(pCur->pMod->pszName + cchName, pszSuffix, cchSuffix)
+                        &&  !kHlpMemICompAscii(pCur->pMod->pszName, pszName, cchName))
                     break;
                     if (    fNameHasSuffix
                         &&  pCur->pMod->cchName == cchName - cchSuffix
-                        &&  !kHlpMemIComp(pCur->pMod->pszName, pszName, cchName - cchSuffix))
+                        &&  !kHlpMemICompAscii(pCur->pMod->pszName, pszName, cchName - cchSuffix))
                     break;
                     if (cchPrefix)
                     {
                         if (    pCur->pMod->cchName == cchName + cchPrefix + cchSuffix
-                            &&  !kHlpMemIComp(pCur->pMod->pszName, pszPrefix, cchPrefix)
-                            &&  !kHlpMemIComp(pCur->pMod->pszName + cchPrefix, pszName, cchName)
-                            &&  !kHlpMemIComp(pCur->pMod->pszName + cchPrefix + cchName, pszSuffix, cchSuffix))
+                            &&  !kHlpMemICompAscii(pCur->pMod->pszName, pszPrefix, cchPrefix)
+                            &&  !kHlpMemICompAscii(pCur->pMod->pszName + cchPrefix, pszName, cchName)
+                            &&  !kHlpMemICompAscii(pCur->pMod->pszName + cchPrefix + cchName, pszSuffix, cchSuffix))
                         break;
                         if (    fNameHasSuffix
                             &&  pCur->pMod->cchName == cchName + cchPrefix - cchSuffix
-                            &&  !kHlpMemIComp(pCur->pMod->pszName, pszPrefix, cchPrefix)
-                            &&  !kHlpMemIComp(pCur->pMod->pszName + cchPrefix, pszName, cchName - cchSuffix))
+                            &&  !kHlpMemICompAscii(pCur->pMod->pszName, pszPrefix, cchPrefix)
+                            &&  !kHlpMemICompAscii(pCur->pMod->pszName + cchPrefix, pszName, cchName - cchSuffix))
                         break;
                     }