Changeset 1402 for trunk/dll/comp.c

Timestamp:

Mar 14, 2009, 6:17:59 PM (16 years ago)

Author:

Gregg Young

Message:

Remove variable aurgs from docopy & unlinkf (not used); Move more strings to PCSZs and string table; Move PCSZs to compile time initialization; Fix hang on startup caused by a drive scan and a dircnr scan trying to update a drive in the tree at the same time (related to the "treeswitch options); Code cleanup mainly removal of old printfs, SayMsgs, DbgMsg and unneeded %s.

File:

• trunk/dll/comp.c (modified) (7 diffs)

trunk/dll/comp.c

@@ -63 +63 @@
   07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  08 Mar 09 GKY Additional strings move to PCSZs in init.c & String Table
 
 ***********************************************************************/
@@ -524 +526 @@
           switch (cmp->action) {
           case IDM_DELETE:
-            if (!unlinkf("%s", pciS->pszFileName)) {
+            if (!unlinkf(pciS->pszFileName)) {
               WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciS),
                          MPFROM2SHORT(FALSE, CRA_SELECTED));
@@ -582 +584 @@
                   MassMkdir(hwndMain, szDirName);
               }
-              rc = docopyf(MOVE, pciS->pszFileName, "%s", szNewName);
+              rc = docopyf(MOVE, pciS->pszFileName, szNewName);
               if (fResetVerify) {
                 DosSetVerify(fVerify);
@@ -683 +685 @@
                   MassMkdir(hwndMain, szDirName);
               }
-              rc = docopyf(COPY, pciS->pszFileName, "%s", szNewName);
+              rc = docopyf(COPY, pciS->pszFileName, szNewName);
               if (fResetVerify) {
                 DosSetVerify(fVerify);
@@ -1487 +1489 @@
                      HWND_DESKTOP,
                      GetPString(IDS_WARNINGTEXT),
-                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
+                     GetPString(IDS_LENGTHEXCEEDSMAXPATHTEXT));
             }
             return;
@@ -1810 +1812 @@
                                MPFROMLONG(recsNeeded));
         if (!pcilFirst) {
-          Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
-                    recsNeeded);
+          Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
           recsNeeded = 0;
         }
@@ -1820 +1821 @@
                                MPFROMLONG(recsNeeded));
         if (!pcirFirst) {
-          Win_Error(hwndRight, cmp->hwnd, pszSrcFile, __LINE__, "CM_ALLOCRECORD %u failed",
-                    recsNeeded);
+          Win_Error(hwndRight, cmp->hwnd, pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
           recsNeeded = 0;
           FreeCnrItemList(hwndLeft, pcilFirst);