Changeset 361 for trunk/dll/makelist.c

Timestamp:

Jul 26, 2006, 11:38:07 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error
AddToList optimize

File:

• trunk/dll/makelist.c (modified) (10 diffs)

trunk/dll/makelist.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003 Steven H.Levine
-
-  Revisions     12 Feb 03 SHL - AddToFileList: standardize EA math
+  Copyright (c) 2003, 2006 Steven H.Levine
+
+  12 Feb 03 SHL AddToFileList: standardize EA math
+  22 Jul 06 SHL Use Runtime_Error
+  22 Jul 06 SHL AddToList optimize
 
 ***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "fm3dll.h"
+#include "fm3str.h"
+
+static PSZ pszSrcFile = __FILE__;
 
 #pragma alloc_text(MAKELIST,AddToList,AddToFileList,BuildList,FreeListInfo,FreeList)
 #pragma alloc_text(MAKELIST,SortList,BuildArcList,RemoveFromList,CombineLists)
 
-
-VOID SortList (LISTINFO *li) {
-
+VOID SortList (LISTINFO *li)
+{
   /* bubble-sort entries by size, descending */
 
@@ -59 +65 @@
 
 
-VOID FreeListInfo (LISTINFO *li) {
-
+VOID FreeListInfo (LISTINFO *li)
+{
   if(li) {
     if(li->ulitemID)
@@ -73 +79 @@
 
 
-VOID FreeList (CHAR **list) {
-
+VOID FreeList (CHAR **list)
+{
   register INT x;
 
@@ -96 +102 @@
                    INT *numfiles,INT *numalloced)
 {
-
-  FILELIST **test;
-
-  if(string && ffb4) {
-    if(((*numfiles) + 3) > *numalloced) {
-      if((test = realloc(*list,(((*numalloced) + 6) *
-          sizeof(FILELIST *)))) == NULL)
+  FILELIST *pfl;
+  if (string && ffb4) {
+    if (((*numfiles) + 3) > *numalloced) {
+      FILELIST **pflArray;
+      // Use plain realloc for speed
+      pflArray = realloc(*list,(*numalloced + 6) * sizeof(FILELIST *));
+      if (!pflArray) {
+        Runtime_Error(pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
         return 1;
+      }
       (*numalloced) += 6;
-      *list = test;
-    }
-    if(((*list)[*numfiles] = malloc(sizeof(FILELIST) +
-                                    strlen(string))) == NULL)
+      *list = pflArray;
+    }
+    // Use plain malloc for speed
+    pfl = malloc(sizeof(FILELIST) + strlen(string));
+    if (!pfl) {
+      Runtime_Error(pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
       return 2;
-    (*list)[*numfiles]->attrFile = ffb4->attrFile;
-    (*list)[*numfiles]->date = ffb4->fdateLastWrite;
-    (*list)[*numfiles]->time = ffb4->ftimeLastWrite;
-    (*list)[*numfiles]->ladate = ffb4->fdateLastAccess;
-    (*list)[*numfiles]->latime = ffb4->ftimeLastAccess;
-    (*list)[*numfiles]->crdate = ffb4->fdateCreation;
-    (*list)[*numfiles]->crtime = ffb4->ftimeCreation;
-    (*list)[*numfiles]->cbFile = ffb4->cbFile;
-    (*list)[*numfiles]->easize = CBLIST_TO_EASIZE(ffb4->cbList);
-    strcpy((*list)[*numfiles]->fname,string);
+    }
+    pfl->attrFile = ffb4->attrFile;
+    pfl->date = ffb4->fdateLastWrite;
+    pfl->time = ffb4->ftimeLastWrite;
+    pfl->ladate = ffb4->fdateLastAccess;
+    pfl->latime = ffb4->ftimeLastAccess;
+    pfl->crdate = ffb4->fdateCreation;
+    pfl->crtime = ffb4->ftimeCreation;
+    pfl->cbFile = ffb4->cbFile;
+    pfl->easize = CBLIST_TO_EASIZE(ffb4->cbList);
+    strcpy(pfl->fname,string);
+    (*list)[*numfiles] = pfl;
     (*numfiles)++;
     (*list)[*numfiles] = NULL;
@@ -131 +143 @@
 
 
-INT AddToList (CHAR *string,CHAR ***list,INT *numfiles,INT *numalloced) {
-
-  CHAR **test;
-
-  if(string) {
-    if(((*numfiles) + 3) > *numalloced) {
-      if((test = realloc(*list,(((*numalloced) + 6) * sizeof(CHAR *)))) == NULL)
+INT AddToList (CHAR *string,CHAR ***list,INT *numfiles,INT *numalloced)
+{
+  CHAR **ppsz;
+  PSZ psz;
+
+  if (string) {
+    if (((*numfiles) + 3) > *numalloced) {
+      // Use plain realloc for speed
+      ppsz = realloc(*list,(*numalloced + 6) * sizeof(CHAR *));
+      if (!ppsz) {
+        Runtime_Error(pszSrcFile, __LINE__, "realloc");
         return 1;
+      }
       (*numalloced) += 6;
-      *list = test;
-    }
-    if(((*list)[*numfiles] = malloc(strlen(string) + 1)) == NULL)
+      *list = ppsz;
+    }
+    // Use plain malloc for speed
+    psz = malloc(strlen(string) + 1);
+    if (!psz) {
+      Runtime_Error(pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
       return 2;
+    }
+    (*list)[*numfiles] = psz;
     strcpy((*list)[*numfiles],string);
     (*numfiles)++;
@@ -156 +178 @@
 
 
-CHAR ** BuildList (HWND hwndCnr) {
-
+CHAR ** BuildList (HWND hwndCnr)
+{
   PCNRITEM pci;
   CHAR   **list = NULL,**test;
@@ -171 +193 @@
   }
   while(pci && (INT)pci != -1 && !error) {
-    if(!(pci->rc.flRecordAttr & CRA_FILTERED))
+    if (!(pci->rc.flRecordAttr & CRA_FILTERED))
       error = AddToList(pci->szFileName,&list,&numfiles,&numalloc);
     pci = WinSendMsg(hwndCnr,CM_QUERYRECORDEMPHASIS,MPFROMP(pci),
                      MPFROMSHORT(attribute));
   }
-  if(numalloc > numfiles + 1) {
+  if (numalloc > numfiles + 1) {
+    // Use plain realloc for speed
     test = realloc(list,sizeof(CHAR *) * (numfiles + 1));
-    if(test)
+    if (!test)
+      Runtime_Error(pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+    else
       list = test;
   }
@@ -185 +210 @@
 
 
-CHAR ** BuildArcList (HWND hwndCnr) {
-
+CHAR ** BuildArcList (HWND hwndCnr)
+{
   PARCITEM pai;
   CHAR   **list = NULL;
@@ -209 +234 @@
 
 
-CHAR ** RemoveFromList (CHAR **list,CHAR *item) {
-
+CHAR ** RemoveFromList (CHAR **list,CHAR *item)
+{
   register INT x,y;
 
@@ -235 +260 @@
 
 
-CHAR ** CombineLists (CHAR **prime,CHAR **add) {
-
+CHAR ** CombineLists (CHAR **prime,CHAR **add)
+{
   register INT x;
   INT          numalloc,numfiles = 0;