Changeset 144 for trunk/src/helpers/stringh.c

Timestamp:

Feb 26, 2002, 9:28:01 PM (23 years ago)

Author:

umoeller

Message:

Misc minor fixes.

File:

• trunk/src/helpers/stringh.c (modified) (2 diffs)

trunk/src/helpers/stringh.c

@@ -873 +873 @@
  *
  *@@added V0.9.6 (2000-11-12) [umoeller]
+ *@@changed V0.9.18 (2002-02-23) [umoeller]: fixed end char check
  */
 
 BOOL strhIsWord(PCSZ pcszBuf,
                 PCSZ p,                 // in: start of word
-                ULONG cbSearch,                // in: length of word
+                ULONG cbSearch,         // in: length of word
                 PCSZ pcszBeginChars,    // suggestion: "\x0d\x0a ()/\\-,."
                 PCSZ pcszEndChars)      // suggestion: "\x0d\x0a ()/\\-,.:;"
 {
-    BOOL    fEndOK = FALSE;
-
     // check previous char
     if (    (p == pcszBuf)
@@ -890 +889 @@
         // OK, valid begin char:
         // check end char
-        CHAR    cNextChar = *(p + cbSearch);
-        if (cNextChar == 0)
-            fEndOK = TRUE;
+        CHAR    cNextChar;
+        if (!(cNextChar = p[cbSearch]))
+            // null terminator:
+            return TRUE;
         else
         {
-            char *pc = strchr(pcszEndChars, cNextChar);
-            if (pc)
+            // not null terminator: check if char is
+            // in the list of valid end chars
+            if (strchr(pcszEndChars, cNextChar))
+            {
                 // OK, is end char: avoid doubles of that char,
                 // but allow spaces
-                if (    (cNextChar+1 != *pc)
-                     || (cNextChar+1 == ' ')
-                     || (cNextChar+1 == 0)
+                // fixed V0.9.18 (2002-02-23) [umoeller]
+                CHAR cNextNext = p[cbSearch + 1];
+                if (    (cNextNext != cNextChar)
+                     || (cNextNext == ' ')
+                     || (cNextNext == 0)
                    )
-                    fEndOK = TRUE;
-        }
-    }
-
-    return (fEndOK);
+                    return TRUE;
+            }
+        }
+    }
+
+    return FALSE;
 }