Changeset 3441 for trunk/tools/dbginfo/Sym2Hll.cpp

Timestamp:

Apr 24, 2000, 11:38:12 PM (25 years ago)

Author:

bird

Message:

Fixed makefile, added missing sym.h and removed warnings in kHll.cpp and Sym2Hll.cpp.

File:

• trunk/tools/dbginfo/Sym2Hll.cpp (modified) (9 diffs)

trunk/tools/dbginfo/Sym2Hll.cpp

@@ -1 @@
-/* $Id: Sym2Hll.cpp,v 1.4 2000-04-07 02:49:36 bird Exp $
+/* $Id: Sym2Hll.cpp,v 1.5 2000-04-24 21:38:11 bird Exp $
  *
  * Sym2Hll - Symbol file to HLL debuginfo converter.
@@ -38 +38 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+void            syntax(void);
 void *          readfile(const char *pszFilename);
 signed long     fsize(FILE *phFile);
@@ -60 +61 @@
     if (argc != 3)
     {
+        syntax();
         fprintf(stderr, "syntax error\n");
         return -87;
@@ -83 +85 @@
     if (pbSym != NULL)
     {
-        int             rc;
-        kHllModuleEntry*pModule;
-        PMAPDEF         pMapDef;             /* Mapfile header */
+        APIRET              rc;
+        kHllModuleEntry *   pModule;
+        PMAPDEF             pMapDef;        /* Mapfile header */
 
         pMapDef = (PMAPDEF)pbSym;
@@ -91 +93 @@
         {
             int         iSegment;
-            PSEGDEF     pSegDef;             /* Segment header */
+            PSEGDEF     pSegDef;            /* Segment header */
 
             /*
@@ -186 +188 @@
                  * Add segment to the module - FIXME - need info from the LX Object table...
                  */
-                pLXObject = pFileLX->getObject(iSegment-1);
+                pLXObject = pFileLX->getObject((USHORT)iSegment-1);
                 if (pLXObject)
                 {
-                    if (!pModule->addSegInfo(iSegment, 0, pLXObject->o32_size))
+                    if (!pModule->addSegInfo((USHORT)iSegment, 0, pLXObject->o32_size))
                         fprintf(stderr, "warning: addseginfo failed!\n");
                 }
@@ -228 +230 @@
                      * Add symbol - currently we define it as public - it's a symbol local to this module really.
                      */
-                    pModule->addPublicSymbol(pachName, cchName, offset, iSegment, 0);
+                    pModule->addPublicSymbol(pachName, cchName, offset, (USHORT)iSegment, 0);
                 }
 
@@ -293 +295 @@
 
 
+/**
+ * Syntax.
+ */
+void syntax(void)
+{
+    printf("Sym2Hll.exe <symfile> <lxfile>\n");
+}
+
 
 
@@ -314 +324 @@
         if (cbFile > 0)
         {
-            pvFile = malloc(cbFile + 1);
+            pvFile = malloc((size_t)cbFile + 1);
             if (pvFile != NULL)
             {
-                memset(pvFile, 0, cbFile + 1);
-                if (fread(pvFile, 1, cbFile, phFile) == 0)
+                memset(pvFile, 0, (size_t)cbFile + 1);
+                if (fread(pvFile, 1, (size_t)cbFile, phFile) == 0)
                 {   /* failed! */
                     free(pvFile);