Changeset 12 for trunk/src/helpers/winh.c

Timestamp:

Nov 4, 2000, 8:55:45 PM (25 years ago)

Author:

umoeller

Message:

Updated string helpers.

File:

• trunk/src/helpers/winh.c (modified) (3 diffs)

trunk/src/helpers/winh.c

@@ -2368 +2368 @@
     // XXX.CMD file as executable:
     // fix args to /C XXX.CMD
-    PSZ pszNewParams = strdup("/C ");
-    xstrcat(&pszNewParams, pProgDetails->pszExecutable);
+    XSTRING strNewParams;
+    xstrInit(&strNewParams, 200);
+    xstrcpy(&strNewParams, "/C ");
+    xstrcat(&strNewParams, pProgDetails->pszExecutable);
     if (*ppszParams)
     {
         // append old params
-        xstrcat(&pszNewParams, " ");
-        xstrcat(&pszNewParams, *ppszParams);
+        xstrcat(&strNewParams, " ");
+        xstrcat(&strNewParams, *ppszParams);
         free(*ppszParams);
     }
-    *ppszParams = pszNewParams;
+    *ppszParams = strNewParams.psz;
             // freed by caller
 
@@ -2493 +2495 @@
         {
             // enhanced Win-OS/2 session:
-            PSZ psz2 = strdup("/3 ");
+            XSTRING str2;
+            xstrInit(&str2, 200);
+            xstrcpy(&str2, "/3 ");
             if (pszParamsPatched)
             {
                 // append existing params
-                xstrcat(&psz2, pszParamsPatched);
+                xstrcat(&str2, pszParamsPatched);
                 free(pszParamsPatched);
             }
 
-            pszParamsPatched = psz2;
+            pszParamsPatched = str2.psz;
         }
 
@@ -2975 +2979 @@
     if (pszText)
     {
-        if (xstrrpl(&pszText, 0, pszSearch, pszReplaceWith, 0) > 0)
+        if (strhrpl(&pszText, 0, pszSearch, pszReplaceWith, 0) > 0)
         {
             WinSetWindowText(hwnd, pszText);