Changeset 8002 for trunk/tools/impdef/ImpDef.cpp

Timestamp:

Feb 24, 2002, 3:44:40 AM (24 years ago)

Author:

bird

Message:

New kFile* classes.

File:

• trunk/tools/impdef/ImpDef.cpp (modified) (5 diffs)

trunk/tools/impdef/ImpDef.cpp

@@ -1 @@
-/* $Id: ImpDef.cpp,v 1.7 2001-04-17 00:26:28 bird Exp $ */
+/* $Id: ImpDef.cpp,v 1.8 2002-02-24 02:44:40 bird Exp $ */
 /*
  * ImpDef - Create export file which use internal names and ordinals.
@@ -10 +10 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
+//#include <os2.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "ImpDef.h"
+
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
-#include "kInterFaces.h"
+#include "kFileInterfaces.h"
 #include "kFileFormatBase.h"
 #include "kFileDef.h"
+
+#include "ImpDef.h"
 
 
@@ -38 +42 @@
 {
     int     argi;
-    BOOL    fFatal = FALSE;
+    KBOOL   fFatal = FALSE;
     long    lRc = 0;
     char   *pszInput = NULL;
@@ -186 +190 @@
     try
     {
-        kFile Input(pszInput);
+        kFile * pInput = new kFile(pszInput);
         try
         {
-            kFileDef DefFile(&Input);
+            kFileDef * pDefFile = new kFileDef(pInput);
             try
             {
+                kFile * pOutput = new kFile(pszOutput, FALSE);
                 kExportEntry export;
-                kFile Output(pszOutput, FALSE);
 
                 /* generate LIBRARY line */
-                Output.printf(
+                pOutput->printf(
                     ";Internal export definition file - autogenerated by ImpDef.\n"
                     "%s\n",
-                    DefFile.queryType());
+                    pDefFile->queryType());
 
                 /* Description line */
-                if (DefFile.queryDescription())
-                    Output.printf("DESCRIPTION '%s'\n", DefFile.queryDescription());
+                if (pDefFile->queryDescription())
+                    pOutput->printf("DESCRIPTION '%s'\n", pDefFile->queryDescription());
 
                 /* Exports */
-                if (DefFile.exportFindFirst(&export))
+                if (pDefFile->exportFindFirst(&export))
                 {
-                    Output.printf("EXPORTS\n");
+                    pOutput->printf("EXPORTS\n");
                     do
                     {
@@ -235 +239 @@
                         pszName = generateExportName(&export, &szName[0], pOptions);
 
-                        Output.printf("    %-*s  @%ld\n", 40, pszName, export.ulOrdinal);
-                    } while (DefFile.exportFindNext(&export));
-                Output.setSize();
+                        pOutput->printf("    %-*s  @%ld\n", 40, pszName, export.ulOrdinal);
+                    } while (pDefFile->exportFindNext(&export));
+                pOutput->setSize();
+                delete pOutput;
                 }
             }
-            catch (int errorcode)
-            {
-                kFile::StdErr.printf("error creating output file, '%s', errorcode 0x%x\n", pszOutput, errorcode);
+            catch (kError err)
+            {
+                kFile::StdErr.printf("error creating output file, '%s', errorcode 0x%x\n", pszOutput, err.getErrno());
                 lRc = -4;
             }
-        }
-        catch (int errorcode)
-        {
-            kFile::StdErr.printf("%s is not a valid def file, errorcode 0x%x\n", pszInput, errorcode);
+            delete pDefFile;
+        }
+        catch (kError err)
+        {
+            kFile::StdErr.printf("%s is not a valid def file, errorcode 0x%x\n", pszInput, err.getErrno());
             lRc = -3;
         }
-    }
-    catch (int errorcode)
-    {
-        kFile::StdErr.printf( "error openining inputfile, '%s', errorcode 0x%x\n", pszInput, errorcode);
+        //delete pInput; - not needed done by ~kFileFormatBase!
+    }
+    catch (kError err)
+    {
+        kFile::StdErr.printf( "error openining inputfile, '%s', errorcode 0x%x\n", pszInput, err.getErrno());
         lRc = -2;
     }