Changeset 1402 for trunk/dll/worker.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/worker.c (modified) (7 diffs)

trunk/dll/worker.c

@@ -39 +39 @@
                 to prevent duplicate directory names in tree following a copy before initial scan.
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  08 Mar 09 GKY Additional strings move to PCSZs
 
 ***********************************************************************/
@@ -584 +586 @@
                   switch (wk->li->type) {
                   case IDM_OPENICON:
-                    s = "ICON";
+                    s = (PSZ) PCSZ_ICON;
                     break;
                   case IDM_OPENDETAILS:
-                    s = "DETAILS";
+                    s = (PSZ) Details;
                     break;
                   case IDM_OPENTREE:
-                    s = "TREE";
+                    s = (PSZ) PCSZ_TREE;
                     break;
                   case IDM_OPENSETTINGS:
-                    s = Settings;
+                    s = (PSZ) Settings;
                     break;
                   default:
-                    s = Default;
+                    s = (PSZ) Default;
                     break;
                   }
@@ -673 +675 @@
                              wk->hwndFrame,
                              GetPString(IDS_ERRORTEXT),
-                             "%s", GetPString(IDS_NOTWRITENOTARGETTEXT));
+                             GetPString(IDS_NOTWRITENOTARGETTEXT));
                       goto RetryPath;
                     }
@@ -733 +735 @@
                     existed = (IsFile(newname) != -1);
                     isnewer = IsNewer(wk->li->list[x], newname);
-                    /*
-                       {
-                       char temp[CCHMAXPATH * 3];
-                       sprintf(temp,"Target: %s\rSource: %s\rOverold: %lu\rOvernew: %lu\rIsNewer: %lu\rExisted: %lu",newname,wk->li->list[x],overold,overnew,isnewer,existed);
-                       saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,temp);
-                       }
-                     */
                     if (existed && wk->li->type != IDM_RENAME && dontask) {
                       if (!overold && !overnew)
@@ -832 +827 @@
                     if (fRealIdle)
                       priority_idle();
-                    rc = docopyf(type, wk->li->list[x], "%s", newname);
+                    rc = docopyf(type, wk->li->list[x], newname);
                     if (fResetVerify) {
                       DosSetVerify(fVerify);
@@ -888 +883 @@
                                     wk->hwndFrame,
                                     GetPString(IDS_DISKFULLTEXT),
-                                    "%s", GetPString(IDS_ANOTHERDISKTEXT));
+                                    GetPString(IDS_ANOTHERDISKTEXT));
                         if (rc == MBID_RETRY)
                           goto Retry;
@@ -1038 +1033 @@
                         wk->hwndCnr,
                         UM_UPDATERECORDLIST, MPFROMP(files), MPVOID);
-           // DbgMsg(pszSrcFile, __LINE__, "UM_UPDATERECORD %s", *files);
             FreeList(files);
           }