Changeset 32

Timestamp:

Feb 6, 2001, 7:21:38 PM (25 years ago)

Author:

umoeller

Message:

misc. changes

Location:

trunk

Files:

• include/helpers/xstring.h (modified) (1 diff)
• src/helpers/except.c (modified) (2 diffs)
• src/helpers/xstring.c (modified) (8 diffs)

trunk/include/helpers/xstring.h

@@ -153 +153 @@
     typedef XSTRFINDREPLACEC *PXSTRFINDREPLACEC;
 
+    // V0.9.9 (2001-01-29) [lafaix]: constants added
+    #define CRLF2LF TRUE
+    #define LF2CRLF FALSE
+
     VOID XWPENTRY xstrConvertLineFormat(PXSTRING pxstr, BOOL fToCFormat);
     typedef VOID XWPENTRY XSTRCONVERTLINEFORMAT(PXSTRING pxstr, BOOL fToCFormat);

trunk/src/helpers/except.c

@@ -435 +435 @@
                            *(pulStackWord+1));
         pulStackWord = (PULONG)*(pulStackWord);
+
+        if (pulStackWord == 0)
+            fprintf(file, "\n    pulStackWord == 0");
+        else if (pulStackWord >= (PULONG)ptib->tib_pstacklimit)
+            fprintf(file, "\n    pulStackWord >= (PULONG)ptib->tib_pstacklimit");
     } // end while
 }
@@ -736 +741 @@
 
             if (ptib != 0)
+            {
                 excDumpStackFrames(file, ptib, pContextRec);
+            }
         }
     }

trunk/src/helpers/xstring.c

@@ -390 +390 @@
  *@@changed V0.9.6 (2000-11-01) [umoeller]: rewritten
  *@@changed V0.9.7 (2001-01-15) [umoeller]: added ulSourceLength
+ *@@changed V0.9.9 (2001-01-28) [lafaix]: fixed memory leak and NULL source behavior
  */
 
@@ -402 +403 @@
         if (pcszSource)
         {
+            // source specified:
             if (ulSourceLength == 0)
+                // but not length:
                 ulSourceLength = strlen(pcszSource);
-
-            if (ulSourceLength)
+        }
+        else
+            ulSourceLength = 0;
+
+        if (ulSourceLength)
+        {
+            // we do have a source string:
+            ULONG cbNeeded = ulSourceLength + 1;
+            if (cbNeeded > pxstr->cbAllocated)
             {
-                // we do have a source string:
-                ULONG cbNeeded = ulSourceLength + 1;
-                if (cbNeeded > pxstr->cbAllocated)
-                {
-                    // we need more memory than we have previously
-                    // allocated:
-                    pxstr->cbAllocated = cbNeeded;
-                    pxstr->psz = (PSZ)malloc(cbNeeded);
-                }
-                // else: we have enough memory
-
-                // strcpy(pxstr->psz, pcszSource);
-                memcpy(pxstr->psz,
-                       pcszSource,
-                       ulSourceLength);
-                *(pxstr->psz + ulSourceLength) = 0;
+                // we need more memory than we have previously
+                // allocated:
+                if (pxstr->psz)
+                    free(pxstr->psz); // V0.9.9 (2001-01-28) [lafaix]
+                pxstr->cbAllocated = cbNeeded;
+                pxstr->psz = (PSZ)malloc(cbNeeded);
             }
-            else
-            {
-                // no source specified or source is empty:
-                if (pxstr->cbAllocated)
-                    // we did have a string: set to empty,
-                    // but leave allocated memory intact
-                    *(pxstr->psz) = 0;
-                // else: pxstr->psz is still NULL
-            }
-
-            // in all cases, set new length
-            pxstr->ulLength = ulSourceLength;
+            // else: we have enough memory
+
+            // strcpy(pxstr->psz, pcszSource);
+            memcpy(pxstr->psz,
+                   pcszSource,
+                   ulSourceLength + 1); // V0.9.9 (2001-01-31) [umoeller]
         }
+        else
+        {
+            // no source specified or source is empty:
+            if (pxstr->cbAllocated)
+                // we did have a string: set to empty,
+                // but leave allocated memory intact
+                *(pxstr->psz) = 0;
+            // else
+                // we had no string previously: in that case
+                // psz and ulLength and cbAllocated are all still NULL
+        }
+
+        // in all cases, set new length
+        pxstr->ulLength = ulSourceLength;
     }
 
@@ -627 +635 @@
 /*
  *@@ xstrrpl:
- *      replaces cSearchLen characters in pxstr, starting
- *      at the position ulStart, with the string
+ *      replaces cReplLen characters in pxstr, starting
+ *      at the position ulFirstReplPos, with the string
  *      in pxstrReplaceWith.
  *
@@ -657 +665 @@
  *
  *@@added V0.9.7 (2001-01-15) [umoeller]
+ *@@changed V0.9.9 (2001-01-29) [lafaix]: fixed unnecessary allocation when pxstr was big enough
  */
 
@@ -733 +742 @@
             // we have enough memory left,
             // we can just overwrite in the middle...
-
-            PSZ     pszAfterFoundBackup = 0;
+            // fixed V0.9.9 (2001-01-29) [lafaix]
+
             // calc length of string after "found"
             ULONG   cTailLength = pxstr->ulLength - ulFirstReplOfs - cReplLen;
 
-            // if "replace" is longer than "found",
-            // make a backup of the stuff after "found",
-            // or this would get overwritten
-            if (cReplaceLen > cReplLen)
-            {
-                pszAfterFoundBackup = (PSZ)malloc(cTailLength + 1);
-                memcpy(pszAfterFoundBackup,
-                       pFound + cReplLen,
-                       cTailLength + 1);
-            }
+            // first, we move the end to its new location (memmove
+            // handles overlap if needed)
+            memmove(pFound + cReplaceLen,
+                    pFound + cReplLen,
+                    cTailLength + 1); // including null terminator
 
             // now overwrite "found" in the middle
             if (cReplaceLen)
             {
-                memcpy(pxstr->psz + ulFirstReplOfs,
+                memcpy(pFound,
                        pstrReplaceWith->psz,
                        cReplaceLen);        // no null terminator
             }
 
-            // now append tail (stuff after "found") again...
-            if (pszAfterFoundBackup)
-            {
-                // we made a backup above:
-                memcpy(pxstr->psz + ulFirstReplOfs + cReplaceLen,
-                       pszAfterFoundBackup,
-                       cTailLength + 1);
-                free(pszAfterFoundBackup);
-                        // done!
-            }
-            else
-                // no backup:
-                if (cReplaceLen < cReplLen)
-                    // "replace" is shorter than "found:
-                    memcpy(pxstr->psz + ulFirstReplOfs + cReplaceLen,
-                           pFound + cReplLen,
-                           cTailLength + 1);
-                // else (cReplaceLen == cReplLen):
-                // we can leave the tail as it is
-
+            // that's it; adjust the string length now
             pxstr->ulLength = cbNeeded - 1;
         }
@@ -871 +856 @@
  *      (and pxstr was therefore not changed).
  *
- *      This starts the search at *pulOffset. If
- *      (*pulOffset == 0), this starts from the beginning
+ *      This starts the search at *pulOfs. If
+ *      (*pulOfs == 0), this starts from the beginning
  *      of pxstr.
  *
- *      If the string was found, *pulOffset will be set to the
+ *      If the string was found, *pulOfs will be set to the
  *      first character after the new replacement string. This
  *      allows you to call this func again with the same strings
@@ -1007 +992 @@
  *      converts between line formats.
  *
- *      If (fToCFormat == TRUE), all \r\n pairs are replaced
+ *      If (fToCFormat == CRLF2LF), all \r\n pairs are replaced
  *      with \n chars (UNIX or C format).
  *
- *      Reversely, if (fToCFormat == FALSE), all \n chars
+ *      Reversely, if (fToCFormat == LF2CRLF), all \n chars
  *      are converted to \r\n pairs (DOS and OS/2 formats).
  *      No check is made whether this has already been done.
@@ -1018 +1003 @@
 
 VOID xstrConvertLineFormat(PXSTRING pxstr,
-                           BOOL fToCFormat) // in: if TRUE, to C format; if FALSE, to OS/2 format.
+                           BOOL fToCFormat) // in: if CRLF2LF, to C format; if LF2CRLF, to OS/2 format.
 {
     XSTRING     strFind,