Changeset 143

Timestamp:

Feb 23, 2002, 8:47:51 AM (23 years ago)

Author:

umoeller

Message:

PageMage fixes et al.

Location:

trunk

Files:

• include/helpers/stringh.h (modified) (1 diff)
• src/helpers/apps.c (modified) (1 diff)
• src/helpers/stringh.c (modified) (2 diffs)

trunk/include/helpers/stringh.h

@@ -67 +67 @@
                              const char *pszSource,
                              ULONG cbSource);
+
+    ULONG XWPENTRY strhSize(PCSZ pcsz);
 
     ULONG XWPENTRY strhCount(const char *pszSearch, CHAR c);

trunk/src/helpers/apps.c

@@ -829 +829 @@
 
 /*
- *@@ strhSize:
- *      returns the size of the given string, which
- *      is the memory required to allocate a copy,
- *      including the null terminator.
- *
- *      Returns 0 if pcsz is NULL or points to a
- *      null character.
- *
- *@@added V0.9.18 (2002-02-13) [umoeller]
- */
-
-ULONG strhSize(PCSZ pcsz)
-{
-    if (pcsz && *pcsz)
-        return (strlen(pcsz) + 1);
-
-    return (0);
-}
-
-/*
  *@@ appQueryDefaultWin31Environment:
  *      returns the default Win-OS/2 3.1 environment

trunk/src/helpers/stringh.c

@@ -371 +371 @@
 
     return (ul);
+}
+
+/*
+ *@@ strhSize:
+ *      returns the size of the given string, which
+ *      is the memory required to allocate a copy,
+ *      including the null terminator.
+ *
+ *      Returns 0 if pcsz is NULL or points to a
+ *      null character.
+ *
+ *@@added V0.9.18 (2002-02-13) [umoeller]
+ */
+
+ULONG strhSize(PCSZ pcsz)
+{
+    if (pcsz && *pcsz)
+        return (strlen(pcsz) + 1);
+
+    return (0);
 }
 
@@ -603 +623 @@
     if ((p1 = strchr(pszBuf, cQuote)))
     {
-        PSZ p2 = strchr(p1+1, cQuote);
-        if (p2)
+        PSZ p2;
+        if (p2 = strchr(p1+1, cQuote))
         {
             pszReturn = strhSubstr(p1+1, p2);