Changeset 2883 for trunk/kLdr/kLdrModLX.c

Timestamp:

Nov 18, 2006, 12:21:33 PM (19 years ago)

Author:

bird

Message:

cleanup.

File:

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

trunk/kLdr/kLdrModLX.c

@@ -127 +127 @@
 static int kldrModLXDoProtect(PKLDRMODLX pModLX, void *pvBits, unsigned fUnprotectOrProtect);
 static int kldrModLXDoCallDLL(PKLDRMODLX pModLX, unsigned uOp, uintptr_t uHandle);
-static int32_t kldrModLXDoGetOrdinalByName(PKLDRMODLX pModLX, const char *pszName);
 static int kldrModLXDoForwarderQuery(PKLDRMODLX pModLX, const struct e32_entry *pEntry,
                                      PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind);
@@ -259 +258 @@
     cb = KLDR_ALIGN_Z(sizeof(KLDRMODLX), 8)
        + KLDR_ALIGN_Z(KLDR_OFFSETOF(KLDRMOD, aSegments[Hdr.e32_objcnt + 1]), 8)
-       + KLDR_ALIGN_Z(cchFilename + 1, 8),
+       + KLDR_ALIGN_Z(cchFilename + 1, 8)
        + Hdr.e32_ldrsize;
     pModLX = (PKLDRMODLX)kldrHlpAlloc(cb);
@@ -367 +366 @@
      * (The table entry consists of a pascal string followed by a 16-bit ordinal.)
      */
-    pMod->pszName = kldrModLXDoNameTableLookupByOrdinal(pModLX->pbResNameTab,
-                                                        pModLX->pbLoaderSectionLast - pModLX->pbResNameTab + 1,
-                                                        0);
+    pMod->pszName = (const char *)kldrModLXDoNameTableLookupByOrdinal(pModLX->pbResNameTab,
+                                                                      pModLX->pbLoaderSectionLast - pModLX->pbResNameTab + 1,
+                                                                      0);
     if (!pMod->pszName)
         return KLDR_ERR_LX_NO_SONAME;
@@ -467 +466 @@
         if ((pModLX->paObjs[i].o32_flags & (OBJREAD | OBJWRITE | OBJEXEC | OBJRSRC)) == OBJRSRC)
             pMod->aSegments[i].enmProt = KLDRPROT_READONLY;
-        //pMod->aSegments[i].f16bit = !(pModLX->paObjs[i].o32_flags & OBJBIGDEF)
-        //pMod->aSegments[i].fIOPL = !(pModLX->paObjs[i].o32_flags & OBJIOPL)
-        //pMod->aSegments[i].fConforming = !(pModLX->paObjs[i].o32_flags & OBJCONFORM)
+        /*pMod->aSegments[i].f16bit = !(pModLX->paObjs[i].o32_flags & OBJBIGDEF)
+        pMod->aSegments[i].fIOPL = !(pModLX->paObjs[i].o32_flags & OBJIOPL)
+        pMod->aSegments[i].fConforming = !(pModLX->paObjs[i].o32_flags & OBJCONFORM) */
     }
 
@@ -883 +882 @@
 {
     PKLDRMODLX                      pModLX = (PKLDRMODLX)pMod->pvData;
-//    int                             rc;
+/*    int                             rc; */
 
     kldrModLXResolveBaseAddress(pModLX, &BaseAddress);
@@ -927 +926 @@
 static int kldrModLXGetImport(PKLDRMOD pMod, const void *pvBits, uint32_t iImport, char *pszName, size_t cchName)
 {
-    PKLDRMODLX      pModLX = (PKLDRMODLX)pMod->pvData;
+    /*PKLDRMODLX      pModLX = (PKLDRMODLX)pMod->pvData;*/
     const uint8_t * pb = NULL;
     int             rc;
@@ -1011 +1010 @@
 static int kldrModLXEnumDbgInfo(PKLDRMOD pMod, const void *pvBits, PFNKLDRENUMDBG pfnCallback, void *pvUser)
 {
-    //PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;
+    /*PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;*/
 
     /*
@@ -1257 +1256 @@
 
             for (i = pIter->LX_nIter; i > 0; i--, pbDst += pIter->LX_nBytes)
-                memcpy(pbDst, &pIter->LX_Iterdata, pIter->LX_nBytes);
+                kLdrHlpMemCopy(pbDst, &pIter->LX_Iterdata, pIter->LX_nBytes);
             pIter   = (struct LX_Iter *)((char*)pIter + 4 + pIter->LX_nBytes);
         }
@@ -1340 +1339 @@
                     if (cbSrc < 0)
                         return KLDR_ERR_LX_BAD_ITERDATA2;
-                    memset(pbDst, pbSrc[2], cb);
+                    kLdrHlpMemSet(pbDst, pbSrc[2], cb);
                     pbDst += cb;
                     pbSrc += 3;
@@ -1506 +1505 @@
             /* 16-bit copy (unaligned) */
             if (cb & 1)
-                *pbDst++ = *pbDst++;
+                *pbDst++ = *pbSrc++;
             for (cb >>= 1; cb > 0; cb--, pbDst += 2, pbSrc += 2)
                 *(uint16_t *)pbDst = *(const uint16_t *)pbSrc;
@@ -1514 +1513 @@
             /* 32-bit copy (unaligned) */
             if (cb & 1)
-                *pbDst++ = *pbDst++;
+                *pbDst++ = *pbSrc++;
             if (cb & 2)
             {
@@ -1877 +1876 @@
                                  PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser)
 {
-    //PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;
-    //int rc;
+    /*PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;
+    int rc;*/
 
     /** @todo Implement this. */