Changeset 5531 for trunk/tools/database

Timestamp:

Apr 17, 2001, 2:26:28 AM (24 years ago)

Author:

bird

Message:

Second iteration of the kFile* classes and interfaces.

File:

• trunk/tools/database/APIImport.cpp (modified) (9 diffs)

trunk/tools/database/APIImport.cpp

@@ -1 @@
-/* $Id: APIImport.cpp,v 1.8 2001-02-02 08:45:42 bird Exp $ */
+/* $Id: APIImport.cpp,v 1.9 2001-04-17 00:24:46 bird Exp $ */
 /*
  *
@@ -18 +18 @@
 #include "APIImport.h"
 #include "kFile.h"
+#include "kInterfaces.h"
 #include "kFileFormatBase.h"
 #include "kFilePE.h"
@@ -242 +243 @@
 static long processFile(const char *pszFilename, const POPTIONS pOptions, long &cFunctions)
 {
-    kFileFormatBase  *pFile;
     long              lRc = 1;
 
@@ -252 +252 @@
         try
         {
+            kFileFormatBase *   pFileBase = NULL;
+            kExportI *          pExportFile;
+            kModuleI *          pModuleFile;
             char    achDataBuffer[0x200];
             char   *pszModuleName = &achDataBuffer[0];
@@ -259 +262 @@
             try
             {
-                pFile = new kFilePE(&InFile);
+                kFilePE *pFile = new kFilePE(&InFile);
+                pExportFile = pFile;
+                pModuleFile = pFile;
+                pFileBase = pFile;
             }
             catch (int i)
             {
                 i = i;
-                pFile = new kFileDef(&InFile);
-            }
-
-            if (pFile->queryModuleName(pszModuleName))
+                kFileDef *pFile = new kFileDef(&InFile);
+                pExportFile = pFile;
+                pModuleFile = pFile;
+                pFileBase = pFile;
+            }
+
+            if (pModuleFile->moduleGetName(pszModuleName))
             {
                 int cch = strlen(pszModuleName);
@@ -281 +290 @@
                     BOOL    fClearUpdateOk = FALSE;
                     BOOL    fOk;
-                    EXPORTENTRY export;
+                    kExportEntry export;
 
                     /* Clear the update flag for all functions in this DLL. */
@@ -288 +297 @@
 
                     lRc = 0;
-                    fOk = pFile->findFirstExport(&export);
+                    fOk = pExportFile->exportFindFirst(&export);
                     while (fOk)
                     {
                         /* check if name or not */
-                        if (!pFile->isDef() || export.ulOrdinal < ORD_START_INTERNAL_FUNCTIONS)
+                        if (!pFileBase->isDef() || export.ulOrdinal < ORD_START_INTERNAL_FUNCTIONS)
                         {
                             char szIntName[256];
@@ -344 +353 @@
 
                         /* next */
-                        fOk = pFile->findNextExport(&export);
+                        fOk = pExportFile->exportFindNext(&export);
                     }
 
@@ -362 +371 @@
                 fprintf(phLog, "%s: error - could not get module name.\n", pszFilename);
 
-            delete(pFile);
+            delete(pFileBase);
         }
         catch (int err)