Changeset 87 in kStuff

Timestamp:

Sep 7, 2016 1:09:12 PM (8 years ago)

Author:

bird

Message:

kLdrModLX.c: warnings

File:

• trunk/kLdr/kLdrModLX.c (modified) (13 diffs)

trunk/kLdr/kLdrModLX.c

@@ -119 +119 @@
                                  PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 static int kldrModLXDoCreate(PKRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX);
-static const KU8 *kldrModLXDoNameTableLookupByOrdinal(const KU8 *pbNameTable, KI32 cbNameTable, KU32 iOrdinal);
-static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, KU32 cchSymbol, KU32 *piSymbol);
-static const KU8 *kldrModLXDoNameTableLookupByName(const KU8 *pbNameTable, KI32 cbNameTable,
+static const KU8 *kldrModLXDoNameTableLookupByOrdinal(const KU8 *pbNameTable, KSSIZE cbNameTable, KU32 iOrdinal);
+static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, KSIZE cchSymbol, KU32 *piSymbol);
+static const KU8 *kldrModLXDoNameTableLookupByName(const KU8 *pbNameTable, KSSIZE cbNameTable,
                                                        const char *pchSymbol, KSIZE cchSymbol);
 static int kldrModLXDoLoadBits(PKLDRMODLX pModLX, void *pvBits);
@@ -298 +298 @@
     pMod->pOps = NULL;      /* set upon success. */
     pMod->cSegments = Hdr.e32_objcnt;
-    pMod->cchFilename = cchFilename;
+    pMod->cchFilename = (KU32)cchFilename;
     pMod->pszFilename = (char *)K_ALIGN_P(&pMod->aSegments[pMod->cSegments], 8);
     kHlpMemCopy((char *)pMod->pszFilename, kRdrName(pRdr), cchFilename + 1);
@@ -478 +478 @@
         else
             pMod->aSegments[i].cbMapped = pModLX->paObjs[i + 1].o32_base - pModLX->paObjs[i].o32_base;
-        NextRVA += pMod->aSegments[i].cbMapped;
+        NextRVA += (KU32)pMod->aSegments[i].cbMapped;
 
         /* protection */
@@ -709 +709 @@
  * @param   piSymbol    Where to store the symbol ordinal.
  */
-static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, KU32 cchSymbol, KU32 *piSymbol)
+static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, KSIZE cchSymbol, KU32 *piSymbol)
 {
 
@@ -784 +784 @@
  * @param   cchSymbol       The length of the symbol name.
  */
-static const KU8 *kldrModLXDoNameTableLookupByName(const KU8 *pbNameTable, KI32 cbNameTable,
+static const KU8 *kldrModLXDoNameTableLookupByName(const KU8 *pbNameTable, KSSIZE cbNameTable,
                                                    const char *pchSymbol, KSIZE cchSymbol)
 {
@@ -1173 +1173 @@
  * @param   iOrdinal    The ordinal to search for.
  */
-static const KU8 *kldrModLXDoNameTableLookupByOrdinal(const KU8 *pbNameTable, KI32 cbNameTable, KU32 iOrdinal)
+static const KU8 *kldrModLXDoNameTableLookupByOrdinal(const KU8 *pbNameTable, KSSIZE cbNameTable, KU32 iOrdinal)
 {
     while (*pbNameTable != 0 && cbNameTable > 0)
@@ -1424 +1424 @@
     {
         const struct o32_obj * const pObj = &pModLX->paObjs[i];
-        const KU32      cPages = pModLX->pMod->aSegments[i].cbMapped / OBJPAGELEN;
+        const KU32      cPages = (KU32)(pModLX->pMod->aSegments[i].cbMapped / OBJPAGELEN);
         KU32            iPage;
         KU8            *pbPage = (KU8 *)pvBits + (KUPTR)pModLX->pMod->aSegments[i].RVA;
@@ -2039 +2039 @@
     if (pvMapping == KLDRMOD_INT_MAP)
     {
-        pvMapping = pModLX->pvMapping;
+        pvMapping = (void *)pModLX->pvMapping;
         if (!pvMapping)
             return KLDR_ERR_NOT_MAPPED;
@@ -2166 +2166 @@
     if (pvMapping == KLDRMOD_INT_MAP)
     {
-        pvMapping = pModLX->pvMapping;
+        pvMapping = (void *)pModLX->pvMapping;
         if (!pvMapping)
             return KLDR_ERR_NOT_MAPPED;
@@ -2476 +2476 @@
                         &&  off >= 0
                         &&  off <= OBJPAGELEN - 4)
-                        *(KU32 *)&pbPage[off] = uValue;
+                        *(KU32 *)&pbPage[off] = (KU32)uValue;
                     else if (    (u.prlc->nr_stype & NRSRCMASK) == NRSOFF32
                             &&  off >= 0
                             &&  off <= OBJPAGELEN - 4)
-                        *(KU32 *)&pbPage[off] = uValue - (PageAddress + off + 4);
+                        *(KU32 *)&pbPage[off] = (KU32)(uValue - (PageAddress + off + 4));
                     else
                     {
@@ -2501 +2501 @@
                             int off = *poffSrc++;
                             if (off >= 0 && off <= OBJPAGELEN - 4)
-                                *(KU32 *)&pbPage[off] = uValue;
+                                *(KU32 *)&pbPage[off] = (KU32)uValue;
                             else
                             {
@@ -2516 +2516 @@
                             int off = *poffSrc++;
                             if (off >= 0 && off <= OBJPAGELEN - 4)
-                                *(KU32 *)&pbPage[off] = uValue - (PageAddress + off + 4);
+                                *(KU32 *)&pbPage[off] = (KU32)(uValue - (PageAddress + off + 4));
                             else
                             {
@@ -2634 +2634 @@
             break;
         case NRSOFF32:
-            uData.off32 = (KU32)uValue - (PageAddress + off + 4);
+            uData.off32 = (KU32)(uValue - (PageAddress + off + 4));
             cb = 4;
             break;