Changeset 8003 for trunk/tools/common/kDef2Wat.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/kDef2Wat.cpp (modified) (4 diffs)

trunk/tools/common/kDef2Wat.cpp

@@ -1 @@
-/* $Id: kDef2Wat.cpp,v 1.2 2001-04-17 00:26:10 bird Exp $
+/* $Id: kDef2Wat.cpp,v 1.3 2002-02-24 02:47:23 bird Exp $
  *
  * Converter for IBM/MS linker definition files (.DEF) to Watcom linker directives and options.
@@ -14 +14 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
-
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
+#include "kFileInterfaces.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
 #include "kFileDef.h"
 
@@ -58 +58 @@
     try
     {
-        kFile    InFile(pszInput);
-        kFileDef def(&InFile);
+        kFileDef def(new kFile(pszInput));
         try
         {
@@ -75 +74 @@
                     kFile::StdOut.printf("Successfully converted %s to %s\n", pszInput, pszOutput);
                 }
-                catch (int errorcode)
+                catch (kError err)
                 {
-                    kFile::StdErr.printf("Append file %s to %s, errorcode=%d\n", pszAppend, pszInput, errorcode);
+                    kFile::StdErr.printf("Append file %s to %s, errorcode=%d\n", pszAppend, pszInput, err.getErrno());
                     return -3;
                 }
             }
         }
-        catch (int errorcode)
+        catch (kError err)
         {
-            kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, errorcode);
+            kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, err.getErrno());
             return -3;
         }
     }
-    catch (int errorcode)
+    catch (kError err)
     {
-        kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, errorcode);
+        kFile::StdErr.printf("Failed to read .DEF file (%s), errorcode=%d\n", pszInput, err.getErrno());
         return -2;
     }