Changeset 121 for trunk/src/helpers/xstring.c

Timestamp:

Dec 5, 2001, 9:37:33 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/xstring.c (modified) (4 diffs)

trunk/src/helpers/xstring.c

@@ -85 +85 @@
 
 /*
- *      Copyright (C) 1999-2000 Ulrich M”ller.
+ *      Copyright (C) 1999-2001 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -220 +220 @@
 {
     if (!pszNew)
-    {
         memset(pxstr, 0, sizeof(XSTRING));
-    }
     else
     {
@@ -792 +790 @@
  +          //                             1         2
  +
- +          xstrInitCopy(&xstrReplacement, "stupid");
- +
  +          xstrrpl(&xstr,
  +                  10,     // position of "test"
  +                  4,      // length of "test"
- +                  &xstrReplacement);
+ +                  "stupid",
+ +                  6);     // strlen("stupid")
  *
  *      This would yield "This is a stupid string."
@@ -878 +875 @@
             {
                 // we have a replacement:
-                // insert it next
-
-                /* memcpy(pszNew + ulFirstReplOfs,
-                       pstrReplaceWith->psz,
-                       cReplaceWithLen + 1);        // include null terminator
-                */
-                // no, we no longer can be sure that pcszReplaceWith is
-                // null terminated, so terminate explicitly
+                // insert it next...
+                // we no longer can be sure that pcszReplaceWith
+                // is null terminated, so terminate explicitly
                 // V0.9.11 (2001-04-22) [umoeller]
-
                 memcpy(pszNew + ulFirstReplOfs,
                        pcszReplaceWith,