Changeset 1038 for trunk/dll/grep.c

Timestamp:

Jul 4, 2008, 10:33:59 PM (17 years ago)

Author:

Gregg Young

Message:

More fortify cleanup

File:

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

trunk/dll/grep.c

@@ -276 +276 @@
   }
 
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
   grep = *(GREP *)arg;
   *grep.stopflag = 0;                   // reset thread-killing flag
@@ -288 +291 @@
       WinCancelShutdown(ghmq, TRUE);
       IncrThreadUsage();
-# ifdef FORTIFY
-  Fortify_EnterScope();
-# endif
       // DosSleep(100); //05 Aug 07 GKY 128     // 07 Feb 08 SHL
       // hwndStatus does not exist for applet
@@ -412 +412 @@
     FreeDupes(&grep);
   if (grep.numlines && grep.matched) {
-# ifdef FORTIFY
-    xfree(grep.matched, pszSrcFile, __LINE__);
-# else
     free(grep.matched);
-# endif
   }
   // 07 Feb 08 SHL fixme to free grep here when not static
@@ -663 +659 @@
     if (grep->insertffb) {
       for (x = 0; grep->insertffb[x]; x++) {
-# ifdef FORTIFY
-        xfree(grep->insertffb[x], pszSrcFile, __LINE__);
-# else
         free(grep->insertffb[x]);
-#endif
       }
       xfree(grep->insertffb, pszSrcFile, __LINE__);
@@ -673 +665 @@
     if (grep->dir) {
       for (x = 0; grep->dir[x]; x++) {
-# ifdef FORTIFY
-        xfree(grep->dir[x], pszSrcFile, __LINE__);
-# else
         free(grep->dir[x]);
-# endif
       }
       xfree(grep->dir, pszSrcFile, __LINE__);
@@ -1163 +1151 @@
     next = i->next;
     if (i->name) {
-# ifdef FORTIFY
-      xfree(i->name, pszSrcFile, __LINE__);
-# else
       free(i->name);
-# endif
-    }
-# ifdef FORTIFY
-    xfree(i, pszSrcFile, __LINE__);
-# else
+    }
     free(i);
-# endif
     i = next;
   }