Changeset 3441 for trunk/tools/dbginfo/kHll.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/kHll.cpp (modified) (16 diffs)

trunk/tools/dbginfo/kHll.cpp

@@ -1 @@
-/* $Id: kHll.cpp,v 1.11 2000-04-07 17:20:24 bird Exp $
+/* $Id: kHll.cpp,v 1.12 2000-04-24 21:38:12 bird Exp $
  *
  * kHll - Implementation of the class kHll.
@@ -122 +122 @@
     assert(pPubSym != NULL);
 
-    pPubSym->cchName = cchName;
+    pPubSym->cchName = (unsigned char)cchName;
     pPubSym->achName[0] = '\0';
     strncat((char*)&pPubSym->achName[0], pachName, cchName);
@@ -402 +402 @@
     if ((cbFilenames + cchFilename + 1) >= cbFilenamesAllocated)
     {
-        void *pv = realloc(pachFilenames, cbFilenamesAllocated + 256);
+        void *pv = realloc(pachFilenames, (size_t)cbFilenamesAllocated + 256);
         assert(pv != NULL);
         if (pv == NULL)
@@ -414 +414 @@
      * Add filename
      */
-    pachFilenames[cbFilenames++] = cchFilename;
+    pachFilenames[cbFilenames++] = (char)cchFilename;
     memcpy(&pachFilenames[cbFilenames], pachFilename, cchFilename);
     cbFilenames += cchFilename;
 
-    return ++cFilenames;
+    return (unsigned short)++cFilenames;
 }
 
@@ -449 +449 @@
     FirstEntry.hll04.uchType = 3;       /* filename */
     FirstEntry.hll04.uchReserved = 0;
-    FirstEntry.hll04.cEntries = max(cFilenames, 1);
+    FirstEntry.hll04.cEntries = (unsigned short)max(cFilenames, 1);
     FirstEntry.hll04.iSeg = 0;
-    FirstEntry.hll04.u1.cbFileNameTable = cbFilenames > 0 ? cbFilenames : 8;
+    FirstEntry.hll04.u1.cbFileNameTable = cbFilenames != 0 ? cbFilenames : 8;
     cb = sizeof(FirstEntry.hll04);
     cbWritten = cbWrote = fwrite(&FirstEntry, 1, cb, phFile);
@@ -465 +465 @@
         return -1;
 
-    if (cbFilenames > 0)
+    if (cbFilenames != 0)
     {
         cbWritten += cbWrote = fwrite(pachFilenames, 1, cbFilenames, phFile);
@@ -543 +543 @@
     assert(pModule != NULL);
     memset(pModule, 0, sizeof(*pModule));
-    pModule->cchName = cchName;
+    pModule->cchName = (unsigned char)cchName;
     strcpy((char*)&pModule->achName[0], pszName);
     pModule->chVerMajor = 4;
@@ -554 +554 @@
 
     /* objects */
-    if (cSegInfo > 0)
+    if (cSegInfo != 0)
     {
         pModule->SegInfo0.iObject = paSegInfo->iObject;
@@ -688 +688 @@
         off,
         iObject,
-        pvType == NULL ? 0 : -1 //FIXME/TODO: Types->getIndex(pvType); check if 0 or -1.
+        (unsigned short)(pvType == NULL ? 0 : -1) //FIXME/TODO: Types->getIndex(pvType); check if 0 or -1.
         );
 
@@ -820 +820 @@
     cchWritten += cch;
 
-    if (cbPublicSymbols > 0)
+    if (cbPublicSymbols != 0)
     {
         hllDirEntry.usType  = HLL_DE_PUBLICS;
@@ -858 +858 @@
     */
 
-    if (cbSource > 0)
+    if (cbSource != 0)
     {
         hllDirEntry.usType  = HLL_DE_IBMSRC;
@@ -965 +965 @@
     while (pModule != NULL)
     {
-        cch = pModule->writeDirEntries(phFile, iMod);
+        cch = pModule->writeDirEntries(phFile, (unsigned short)iMod);
         if (cch == -1)
             return -1;
@@ -1049 +1049 @@
     pEntry = new kHllModuleEntry(
         pszName,
-        pvLib == NULL ? 0 : -1, //FIXME/TODO: Libs->getIndex(pvLib); check if 0 or -1;
-        cSegInfo,
+        (unsigned short)(pvLib == NULL ? 0 : -1), //FIXME/TODO: Libs->getIndex(pvLib); check if 0 or -1;
+        (unsigned char) cSegInfo,
         paSegInfo);
 
@@ -1077 +1077 @@
     char szModName[256];
     kHllModuleEntry *   pEntry;
-    assert(pachName != NULL && cchName > 0);
+    assert(pachName != NULL && cchName != 0);
 
     szModName[0] = '\0';
@@ -1083 +1083 @@
     pEntry = new kHllModuleEntry(
         szModName,
-        pvLib == NULL ? 0 : -1, //FIXME/TODO: Libs->getIndex(pvLib); check if 0 or -1;
-        cSegInfo,
+        (unsigned short)(pvLib == NULL ? 0 : -1), //FIXME/TODO: Libs->getIndex(pvLib); check if 0 or -1;
+        (unsigned char)cSegInfo,
         paSegInfo);
 
@@ -1256 +1256 @@
 signed long fsize(FILE *phFile)
 {
-    int ipos;
+    long ipos;
     signed long cb;