Changeset 1039 for trunk/dll/notebook.c

Timestamp:

Jul 6, 2008, 12:16:21 AM (17 years ago)

Author:

Gregg Young

Message:

Removed unnecessary xfrees and included fortify.h where needed; moved several misplaced (x)frees;

File:

• trunk/dll/notebook.c (modified) (9 diffs)

trunk/dll/notebook.c

@@ -51 +51 @@
 #include "notebook.h"
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA2)
@@ -214 +215 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -222 +223 @@
         NormalizeCmdLine(pszWorkBuf, szCLBuf);
         memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
-        xfree(pszWorkBuf, pszSrcFile, __LINE__);
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(pszWorkBuf);
+        free(szCLBuf);
         if (!strchr(virus, '%') && strlen(virus) > 3)
           strcat(virus, " %p");
@@ -487 +488 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -522 +523 @@
           strcat(bined, " %a");
       }
-      xfree(pszWorkBuf, pszSrcFile, __LINE__);
-      xfree(szCLBuf, pszSrcFile, __LINE__);
+      free(pszWorkBuf);
+      free(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "Viewer", viewer);
       PrfWriteProfileString(fmprof, appname, "Editor", editor);
@@ -690 +691 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -723 +724 @@
         memcpy(mailrun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
-      xfree(pszWorkBuf, pszSrcFile, __LINE__);
-      xfree(szCLBuf, pszSrcFile, __LINE__);
+      free(pszWorkBuf);
+      free(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "HttpRunDir", httprundir);
       PrfWriteProfileString(fmprof, appname, "FtpRunDir", ftprundir);
@@ -1326 +1327 @@
       pszWorkBuf = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!pszWorkBuf) {
-        xfree(szCLBuf, pszSrcFile, __LINE__);
+        free(szCLBuf);
         return 0; //already complained
       }
@@ -1346 +1347 @@
           strcat(compare, " %a");
       }
-      xfree(pszWorkBuf, pszSrcFile, __LINE__);
-      xfree(szCLBuf, pszSrcFile, __LINE__);
+      free(pszWorkBuf);
+      free(szCLBuf);
       PrfWriteProfileString(fmprof, appname, "Compare", compare);
       break;