Changeset 144

Timestamp:

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

Author:

umoeller

Message:

Misc minor fixes.

Location:

trunk/src/helpers

Files:

• stringh.c (modified) (2 diffs)
• xstring.c (modified) (7 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;
 }
 

trunk/src/helpers/xstring.c

@@ -15 +15 @@
  *      a char* pointer pointing to heap memory, which is managed
  *      automatically.
+ *
+ *      Besides being convenient, these functions are highly
+ *      optimized to use as few strlen's and memcpy's as
+ *      possible.
  *
  *      Using these functions has the following advantages:
@@ -85 +89 @@
 
 /*
- *      Copyright (C) 1999-2001 Ulrich M”ller.
+ *      Copyright (C) 1999-2002 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -210 +214 @@
  *
  +          XSTRING str;
- +          xstrInitSet(&str, strdup("blah"));
+ +          xstrInitSet(&str, strdup("blah"), 0);
  *
  *@@added V0.9.16 (2002-01-13) [umoeller]
  */
 
-void xstrInitSet2(PXSTRING pxstr,
-                  PSZ pszNew,
-                  ULONG ulNewLength)
+void xstrInitSet2(PXSTRING pxstr,           // in/out: string
+                  PSZ pszNew,               // in: malloc'd string to load pxstr with
+                  ULONG ulNewLength)        // in: length of pszNew or 0 to run strlen()
 {
     if (!pszNew)
@@ -326 +330 @@
         if (pcszSource)
         {
-            pxstr->ulLength = strlen(pcszSource);
-
-            if (pxstr->ulLength)
+            if (pxstr->ulLength = strlen(pcszSource))
             {
                 // we do have a source string:
@@ -542 +544 @@
 
     xstrClear(pxstr);
-    pxstr->psz = pszNew;
-    if (pszNew)
+    if (pxstr->psz = pszNew)
     {
         if (!ulNewLength)
@@ -576 +577 @@
  *      as necessary.
  *
- *      If pxstr contains something, its contents are destroyed.
+ *      If pxstr contains something, its contents are overwritten.
  *
  *      With ulSourceLength, specify the length of pcszSource
@@ -1010 +1011 @@
             // now overwrite "found" in the middle
             if (cReplaceWithLen)
-            {
                 memcpy(pFound,
                        pcszReplaceWith,
                        cReplaceWithLen);        // no null terminator
-            }
 
             // that's it; adjust the string length now