Changeset 1545 for trunk/dll/arccnrs.c

Timestamp:

Oct 24, 2010, 12:00:47 AM (15 years ago)

Author:

Gregg Young

Message:

Added ForwardslashToBackslash function to streamline code.

File:

• trunk/dll/arccnrs.c (modified) (5 diffs)

trunk/dll/arccnrs.c

@@ -83 +83 @@
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   15 Apr 10 JBS Ticket 422: Stop hang when open archive gets deleted or moved
+  23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code
 
 ***********************************************************************/
@@ -1624 +1625 @@
             memmove(s, p + 1, strlen(p + 1));
         }
-        sprintf(WaitChild->filename, "%s\\%s", dcd->workdir, s);
-        p = WaitChild->filename;
-        while (*p) {
-          if (*p == '/')
-            *p = '\\';
-          p++;
-        }
+        sprintf(WaitChild->filename, "%s\\%s", dcd->workdir, s);
+        ForwardslashToBackslash(WaitChild->filename);
         free(s);
         WaitChild->RunFlags = SEPARATE | ASYNCHRONOUS | WAIT |
@@ -1923 +1919 @@
                 CHAR *temp, *p;
 
-                temp = li->list[x];
-                p = temp;
-                while (*p) {
-                  if (*p == '/')
-                    *p = '\\';
-                  p++;
-                }
+                temp = li->list[x];
+                ForwardslashToBackslash(temp);
                 p = xmalloc(strlen(temp) + strlen(li->targetpath) + 2,
                             pszSrcFile, __LINE__);
@@ -2161 +2152 @@
             CHAR **list2 = NULL, fullname[CCHMAXPATH * 2], *p;
 
-            for (x = 0; li->list[x]; x++) {
-              p = li->list[x];
-              while (*p) {
-                if (*p == '/')
-                  *p = '\\';
-                p++;
-              }
+            for (x = 0; li->list[x]; x++) {
+              ForwardslashToBackslash(li->list[x]);
               BldFullPathName(fullname, dcd->directory, li->list[x]);
               if (IsFile(fullname) != -1)
@@ -3622 +3608 @@
                          FIL_QUERYFULLNAME, fullname, sizeof(fullname)))
       strcpy(fullname, arcname);
-    p = fullname;
-    while (*p) {
-      if (*p == '/')
-        *p = '\\';
-      p++;
-    }
+    ForwardslashToBackslash(fullname);
     if (!info)
       info = find_type(fullname, arcsighead);