Changeset 1036 for trunk/dll/worker.c

Timestamp:

Jul 2, 2008, 12:53:51 AM (17 years ago)

Author:

Gregg Young

Message:

More fortify changes eliminated the leave scope wrapper except in mainwnd.c Wrapper only unlaods stuuff (archivers, commands, etc

File:

• trunk/dll/worker.c (modified) (6 diffs)

trunk/dll/worker.c

@@ -135 +135 @@
   CHAR szQuotedFileName[CCHMAXPATH];
 
-  if (wk) {
+
 # ifdef FORTIFY
   Fortify_EnterScope();
 # endif
+  if (wk) {
     if (wk->li && wk->li->list && wk->li->list[0]) {
       hab2 = WinInitialize(0);
@@ -270 +271 @@
                                  UM_COLLECTFROMFILE, MPFROMP(temp), MPVOID))
                       xfree(temp, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
                   }
                 }
@@ -997 +995 @@
   UINT numfiles = 0, numalloc = 0;
 
-  if (wk) {
+
 # ifdef FORTIFY
   Fortify_EnterScope();
 # endif
+  if (wk) {
     if (wk->li && wk->li->list && wk->li->list[0]) {
       hab2 = WinInitialize(0);
@@ -1142 +1141 @@
                 strcpy(p, wk->li->list[x]);
                 xfree(wk->li->list[x], pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
                 wk->li->list[x] = xstrdup(szBuffer, pszSrcFile, __LINE__);
               }
@@ -1325 +1321 @@
                                MPFROMLONG(5 + viewtype), MPFROMP(temp)))
                     xfree(temp, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
                 }
                 DosSleep(1);
@@ -1373 +1366 @@
                                MPFROMLONG(4 + viewtype), MPFROMP(temp)))
                     xfree(temp, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
                 }
                 DosSleep(1);