Changeset 985 for trunk/dll/newview.c

Timestamp:

Mar 1, 2008, 2:37:14 AM (17 years ago)

Author:

Gregg Young

Message:

Update sizes dialog (ticket 44); Make max command line length user settable (ticket 199); use xfree for free in most cases (ticket 212); initial code to check for valid ini file (ticket 102); Some additional refactoring and structure rework; Some documentation updates;

File:

• trunk/dll/newview.c (modified) (13 diffs)

trunk/dll/newview.c

@@ -29 +29 @@
   28 Dec 07 GKY Add mailrun to allow mailto by clicking on an email address in the viewer
   29 Dec 07 GKY Formated email address using "<mailto:"
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Refactor global command line variables to notebook.h
 
 ***********************************************************************/
@@ -49 +51 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // httprun etc
 #include "fm3dll.h"
 
@@ -638 +641 @@
   if (ad) {
     ad->selected = ad->textsize = ad->numlines = ad->numalloc = 0;
-    if (ad->text)
-      free(ad->text);
-    if (ad->lines)
-      free(ad->lines);
-    if (ad->markedlines)
-      free(ad->markedlines);
+    xfree(ad->text);
+    xfree(ad->lines);
+    xfree(ad->markedlines);
     ad->text = NULL;
     ad->lines = NULL;
@@ -1202 +1202 @@
             ad->found = 0;
             ad->selected = ad->numlines = ad->numalloc = 0;
-            if (ad->lines)
-              free(ad->lines);
-            if (ad->markedlines)
-              free(ad->markedlines);
+            xfree(ad->lines);
+            xfree(ad->markedlines);
             ad->lines = NULL;
             ad->markedlines = NULL;
@@ -1314 +1312 @@
             }
             if (ad->numlines) {
-              ad->markedlines = xmalloc(ad->numlines, pszSrcFile, __LINE__);
+              ad->markedlines = xmallocz(ad->numlines, pszSrcFile, __LINE__);
               if (ad->markedlines) {
-                memset(ad->markedlines, 0, ad->numlines);
                 ad->selected = 0;
               }
@@ -1372 +1369 @@
           priority_normal();
           if (*ad->filename) {
-            if (ad->text)
-              free(ad->text);
-            if (ad->lines)
-              free(ad->lines);
-            if (ad->markedlines)
-              free(ad->markedlines);
+            xfree(ad->text);
+            xfree(ad->lines);
+            xfree(ad->markedlines);
             ad->text = NULL;
             ad->lines = NULL;
@@ -1426 +1420 @@
                               __LINE__,
                               GetPString(IDS_ERRORREADINGTEXT), ad->filename);
-                    free(ad->text);
+                    xfree(ad->text);
                     ad->text = NULL;
                     ad->textsize = 0;
@@ -2381 +2375 @@
               switch (ret) {
               case 0:
-                free(urld);
+                xfree(urld);
                 goto NoAdd;
               case 1:
@@ -2407 +2401 @@
                             "%s %s", httprun, urld->url);
                 }
-                free(urld);
+                xfree(urld);
                 goto NoAdd;
               case 2:
@@ -2433 +2427 @@
                             "%s %s", ftprun, urld->url);
                 }
+                xfree(urld);
+                goto NoAdd;
               case 3:
                 if (*urld->url){
@@ -2441 +2437 @@
                           "%s %s", mailrun, urld->url);
                 }
-                free(urld);
+                xfree(urld);
                 goto NoAdd;
               default:
                 break;
               }
-              free(urld);
+              xfree(urld);
             }
           }
@@ -2524 +2520 @@
                                   MPFROMLONG(whichline));
             }
-            free(s);
+            xfree(s);
           }
         }
@@ -3937 +3933 @@
         FreeViewerMem(hwnd);
         WinSetWindowPtr(hwnd, QWL_USER, NULL);
-        free(ad);
+        xfree(ad);
       }
       if (hwndRestore && hwndRestore != HWND_DESKTOP) {