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

trunk/dll/arccnrs.c

@@ -74 +74 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
 
 ***********************************************************************/
@@ -615 +616 @@
     if (highest > 50) {
       saymsg(MB_ENTER | MB_ICONEXCLAMATION, HWND_DESKTOP,
-             GetPString(IDS_SHAMETEXT), "%s", GetPString(IDS_BUNGEDUPTEXT));
+             GetPString(IDS_SHAMETEXT), GetPString(IDS_BUNGEDUPTEXT));
     }
     if (info->fnpos == -1)
@@ -807 +808 @@
                              MPFROMLONG(1L));
             if (!pai) {
-              Runtime_Error(pszSrcFile, __LINE__, "CM_ALLOCRECORD");
+              Runtime_Error(pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
               break;
             }
@@ -1417 +1418 @@
           len = DrgQueryStrName(pdt->hstrSelectedRMF, CCHMAXPATH, filename);
           filename[len] = 0;
-          if (!strnicmp(filename, "OS2FILE,", 8)) {
-            // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"RMF = \"%s\"",filename);
-          }
-          else {
+          if (strnicmp(filename, "OS2FILE,", 8)) {
             *filename = 0;
-            len =
-              DrgQueryStrName(pdt->hstrRenderToName, CCHMAXPATH, filename);
+            len = DrgQueryStrName(pdt->hstrRenderToName, CCHMAXPATH, filename);
             filename[len] = 0;
             if (len && *filename) {
@@ -1432 +1429 @@
               }
             }
-            else {
-              // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"No render-to name given.");
-            }
           }
         }
@@ -1459 +1453 @@
         membername[len] = 0;
         if (*membername && len && filename) {
-          unlinkf("%s", filename);
+          unlinkf(filename);
           strcpy(construct, filename);
           p = strrchr(filename, '\\');
@@ -1469 +1463 @@
             *p = 0;
           }
-          // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%s %s %s\r[%s]",dcd->info->extract,dcd->arcname,membername,construct);
           runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS | WAIT |
                   (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
@@ -1480 +1473 @@
           if (IsFile(construct) != -1) {
             rename(construct, filename);
-            unlinkf("%s", construct);
+            unlinkf(construct);
             if (IsFile(filename) != -1)
               usRes = DMFL_RENDEROK;
@@ -2678 +2671 @@
       SWP swp;
       CHAR *filename = mp1;
-      printf("%s %d UM_ENTER %s\n",__FILE__, __LINE__, filename); fflush(stdout);
+      //printf("%s %d UM_ENTER %s\n",__FILE__, __LINE__, filename); fflush(stdout);
       if (IsFile(filename) != 1) {
         free(mp1);