Changeset 60275 in vbox

Timestamp:

Mar 31, 2016 12:07:30 PM (9 years ago)

Author:

vboxsync

Message:

VBoxBs3ObjConverter.cpp: warnings.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3ObjConverter.cpp (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3ObjConverter.cpp

@@ -4074 +4074 @@
 
                 uint16_t iLine;
-                uint32_t off;
+                uint32_t offSeg;
                 if (bRecType == OMF_LINNUM16)
                     while (offRec + 4 < cbRec)
                     {
-                        iLine = RT_MAKE_U16(pbRec[offRec + 0], pbRec[offRec + 1]);
-                        off   = RT_MAKE_U16(pbRec[offRec + 2], pbRec[offRec + 3]);
-                        if (!collectOmfAddLine(pOmfStuff, idxSeg, off, iLine, offSrcInfo))
+                        iLine  = RT_MAKE_U16(pbRec[offRec + 0], pbRec[offRec + 1]);
+                        offSeg = RT_MAKE_U16(pbRec[offRec + 2], pbRec[offRec + 3]);
+                        if (!collectOmfAddLine(pOmfStuff, idxSeg, offSeg, iLine, offSrcInfo))
                             return false;
                         offRec += 4;
@@ -4087 +4087 @@
                     while (offRec + 6 < cbRec)
                     {
-                        iLine = RT_MAKE_U16(pbRec[offRec + 0], pbRec[offRec + 1]);
-                        off   = RT_MAKE_U32_FROM_U8(pbRec[offRec + 2], pbRec[offRec + 3], pbRec[offRec + 4], pbRec[offRec + 5]);
-                        if (!collectOmfAddLine(pOmfStuff, idxSeg, off, iLine, offSrcInfo))
+                        iLine  = RT_MAKE_U16(pbRec[offRec + 0], pbRec[offRec + 1]);
+                        offSeg = RT_MAKE_U32_FROM_U8(pbRec[offRec + 2], pbRec[offRec + 3], pbRec[offRec + 4], pbRec[offRec + 5]);
+                        if (!collectOmfAddLine(pOmfStuff, idxSeg, offSeg, iLine, offSrcInfo))
                             return false;
                         offRec += 6;
@@ -4248 +4248 @@
 
             /* Emit data for each source file. */
-            for (uint32_t j = 0; j < pSegLines->cFiles; j++)
+            for (j = 0; j < pSegLines->cFiles; j++)
             {
                 uint32_t const cbPairs = pSegLines->paFiles[j].cPairs * sizeof(RTCV8LINEPAIR);