Changeset 8003 for trunk/tools/common/kDump.cpp

Timestamp:

Feb 24, 2002, 3:47:28 AM (24 years ago)

Author:

bird

Message:

New kFile* classes; now in sync with os2tools.

File:

• trunk/tools/common/kDump.cpp (modified) (4 diffs)

trunk/tools/common/kDump.cpp

@@ -1 @@
-/* $Id: kDump.cpp,v 1.3 2001-04-17 00:26:10 bird Exp $
+/* $Id: kDump.cpp,v 1.4 2002-02-24 02:47:24 bird Exp $
  *
  * Generic dumper...
@@ -19 +19 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
-
 #include <stdio.h>
 
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
+#include "kFileInterfaces.h"
 #include "kFileDef.h"
 #include "kFileLX.h"
@@ -42 +42 @@
         try
         {
-            kFile               file(argv[argi]);
             kFileFormatBase *   pFile = NULL;
-            try {pFile = new kFilePE(&file);}
-            catch (int err)
+            try {pFile = new kFilePE(new kFile(argv[argi]));}
+            catch (kError err)
             {
-                try {pFile = new kFileLX(&file);}
-                catch (int err)
+                try {pFile = new kFileLX(new kFile(argv[argi]));}
+                catch (kError err)
                 {
-                    try {pFile = new kFileDef(&file);}
-                    catch (int err)
+                    try {pFile = new kFileDef(new kFile(argv[argi]));}
+                    catch (kError err)
                     {
                         kFile::StdErr.printf("Failed to recognize file %s.\n", argv[argi]);
@@ -68 +67 @@
             }
         }
-        catch (int err)
+        catch (kError err)
         {
-            fprintf(stderr, "Fatal: Failed to open file %s err=%d.\n", argv[argi], err);
+            fprintf(stderr, "Fatal: Failed to open file %s err=%d.\n", argv[argi], err.getErrno());
             return -1;
         }