jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-25 09:28:22 +08:00
Code Issues Projects Releases Wiki Activity

Version 0.15.0.1

Browse Source 
- Some type conversions to remove warnings on 64 bit compilation
This commit is contained in:
Nikolaj Schlej 2014-01-09 15:06:12 +00:00
parent ead41ba5bb
commit 9665d0bcff
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tiano/EfiCompress.c
View File

@ -509,20 +509,20 @@ Returns: (VOID)
{ {
NODE i; NODE i;
for (i = WNDSIZ; i <= WNDSIZ + UINT8_MAX; i++) { for (i = (NODE) WNDSIZ; i <= (NODE) WNDSIZ + UINT8_MAX; i++) {
mLevel[i] = 1; mLevel[i] = 1;
mPosition[i] = NIL; /* sentinel */ mPosition[i] = NIL; /* sentinel */
} }
for (i = WNDSIZ; i < WNDSIZ * 2; i++) { for (i = (NODE) WNDSIZ; i < (NODE) WNDSIZ * 2; i++) {
mParent[i] = NIL; mParent[i] = NIL;
} }
mAvail = 1; mAvail = 1;
for (i = 1; i < WNDSIZ - 1; i++) { for (i = 1; i < (NODE) WNDSIZ - 1; i++) {
mNext[i] = (NODE)(i + 1); mNext[i] = (NODE)(i + 1);
} }
mNext[WNDSIZ - 1] = NIL; mNext[WNDSIZ - 1] = NIL;
for (i = WNDSIZ * 2; i <= MAX_HASH_VAL; i++) { for (i = (NODE) WNDSIZ * 2; i <= (NODE) MAX_HASH_VAL; i++) {
mNext[i] = NIL; mNext[i] = NIL;
} }
} }
@ -675,7 +675,7 @@ Returns: (VOID)
mPosition[t] = mPos; mPosition[t] = mPos;
t = mParent[t]; t = mParent[t];
} }
if (t < WNDSIZ) { if (t < (NODE) WNDSIZ) {
mPosition[t] = (NODE)(mPos | PERC_FLAG); mPosition[t] = (NODE)(mPos | PERC_FLAG);
} }
} else { } else {
@ -701,7 +701,7 @@ Returns: (VOID)
// //
for ( ; ; ) { for ( ; ; ) {
if (r >= WNDSIZ) { if (r >= (NODE) WNDSIZ) {
j = MAXMATCH; j = MAXMATCH;
mMatchPos = r; mMatchPos = r;
} else { } else {
@ -777,7 +777,7 @@ Returns: (VOID)
mPrev[s] = r; mPrev[s] = r;
r = mParent[mPos]; r = mParent[mPos];
mParent[mPos] = NIL; mParent[mPos] = NIL;
if (r >= WNDSIZ || --mChildCount[r] > 1) { if (r >= (NODE) WNDSIZ || --mChildCount[r] > 1) {
return; return;
} }
t = (NODE)(mPosition[r] & ~PERC_FLAG); t = (NODE)(mPosition[r] & ~PERC_FLAG);
@ -797,7 +797,7 @@ Returns: (VOID)
mPosition[q] = (INT16)(s | WNDSIZ); mPosition[q] = (INT16)(s | WNDSIZ);
q = mParent[q]; q = mParent[q];
} }
if (q < WNDSIZ) { if (q < (NODE) WNDSIZ) {
if (u >= mPos) { if (u >= mPos) {
u -= WNDSIZ; u -= WNDSIZ;
} }

16
Tiano/TianoCompress.c
View File

@ -522,22 +522,22 @@ STATIC
{ {
NODE Index; NODE Index;
for (Index = WNDSIZ; Index <= WNDSIZ + UINT8_MAX; Index++) { for (Index = (NODE) WNDSIZ; Index <= (NODE) WNDSIZ + UINT8_MAX; Index++) {
mLevel[Index] = 1; mLevel[Index] = 1;
mPosition[Index] = NIL; // sentinel mPosition[Index] = NIL; // sentinel
} }
for (Index = WNDSIZ; Index < WNDSIZ * 2; Index++) { for (Index = (NODE) WNDSIZ; Index < (NODE) WNDSIZ * 2; Index++) {
mParent[Index] = NIL; mParent[Index] = NIL;
} }
mAvail = 1; mAvail = 1;
for (Index = 1; Index < WNDSIZ - 1; Index++) { for (Index = 1; Index < (NODE) WNDSIZ - 1; Index++) {
mNext[Index] = (NODE) (Index + 1); mNext[Index] = (NODE) (Index + 1);
} }
mNext[WNDSIZ - 1] = NIL; mNext[WNDSIZ - 1] = NIL;
for (Index = WNDSIZ * 2; Index <= MAX_HASH_VAL; Index++) { for (Index = (NODE) WNDSIZ * 2; Index <= (NODE) MAX_HASH_VAL; Index++) {
mNext[Index] = NIL; mNext[Index] = NIL;
} }
} }
@ -705,7 +705,7 @@ STATIC
NodeT = mParent[NodeT]; NodeT = mParent[NodeT];
} }
if (NodeT < WNDSIZ) { if (NodeT < (NODE) WNDSIZ) {
mPosition[NodeT] = (NODE) (mPos | (UINT32) PERC_FLAG); mPosition[NodeT] = (NODE) (mPos | (UINT32) PERC_FLAG);
} }
} else { } else {
@ -729,7 +729,7 @@ STATIC
// Node split or creation is involved. // Node split or creation is involved.
// //
for (;;) { for (;;) {
if (NodeR >= WNDSIZ) { if (NodeR >= (NODE) WNDSIZ) {
Index2 = MAXMATCH; Index2 = MAXMATCH;
mMatchPos = NodeR; mMatchPos = NodeR;
} else { } else {
@ -819,7 +819,7 @@ STATIC
mPrev[NodeS] = NodeR; mPrev[NodeS] = NodeR;
NodeR = mParent[mPos]; NodeR = mParent[mPos];
mParent[mPos] = NIL; mParent[mPos] = NIL;
if (NodeR >= WNDSIZ) { if (NodeR >= (NODE) WNDSIZ) {
return ; return ;
} }
@ -851,7 +851,7 @@ STATIC
NodeU = mPosition[NodeQ]; NodeU = mPosition[NodeQ];
} }
if (NodeQ < WNDSIZ) { if (NodeQ < (NODE) WNDSIZ) {
if (NodeU >= mPos) { if (NodeU >= mPos) {
NodeU -= WNDSIZ; NodeU -= WNDSIZ;
} }

2
ffsengine.cpp
View File

@ -1242,7 +1242,7 @@ UINT8 FfsEngine::create(const QModelIndex & index, const UINT8 type, const QByte
if (model->type(parent) != File && model->type(parent) != Section) if (model->type(parent) != File && model->type(parent) != Section)
return ERR_INVALID_SECTION; return ERR_INVALID_SECTION;
if (header.size() < sizeof(EFI_COMMON_SECTION_HEADER)) if (header.size() < (int) sizeof(EFI_COMMON_SECTION_HEADER))
return ERR_INVALID_SECTION; return ERR_INVALID_SECTION;
QByteArray newHeader = header; QByteArray newHeader = header;