sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg: Fix VS2015 warning C4311 & C4312 in RegularExpressionDxe

Browse Source 
warning C4311: pointer truncation from 'void *' to 'unsigned long'
warning C4312: conversion from 'unsigned long' to 'void *' of greater size
Update code to convert type to UINTN first, then convert it to other type.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com>
Acked-by: Michael Kinney <michael.d.kinney@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19114 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Liming Gao
2015-12-04 03:15:08 +00:00
committed by lgao4
parent d76946e328
commit 4d454c54d1
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
View File

@@ -863,7 +863,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
if (BIT_STATUS_AT(reg->bt_mem_end, k->u.mem.num))\
endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\
else\
endp = (UChar* )k->u.mem.end;\
endp = (UChar* )(UINTN)k->u.mem.end;\
if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\
(isnull) = 0; break;\
}\
@@ -904,7 +904,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
if (BIT_STATUS_AT(reg->bt_mem_end, k->u.mem.num))\
endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\
else\
endp = (UChar* )k->u.mem.end;\
endp = (UChar* )(UINTN)k->u.mem.end;\
if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\
(isnull) = 0; break;\
}\
@@ -1344,11 +1344,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (BIT_STATUS_AT(reg->bt_mem_start, i))
rmt[i].rm_so = (regoff_t)(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
else
rmt[i].rm_so = (regoff_t)((UChar* )((void* )(mem_start_stk[i])) - str);
rmt[i].rm_so = (regoff_t)((UChar* )((void* )(UINTN)(mem_start_stk[i])) - str);
rmt[i].rm_eo = (regoff_t)((BIT_STATUS_AT(reg->bt_mem_end, i)
? STACK_AT(mem_end_stk[i])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[i])) - str);
: (UChar* )((void* )(UINTN)mem_end_stk[i])) - str);
}
else {
rmt[i].rm_so = rmt[i].rm_eo = ONIG_REGION_NOTPOS;
@@ -1364,11 +1364,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (BIT_STATUS_AT(reg->bt_mem_start, i))
region->beg[i] = (int)(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
else
region->beg[i] = (int)((UChar* )((void* )mem_start_stk[i]) - str);
region->beg[i] = (int)((UChar* )((void* )(UINTN)mem_start_stk[i]) - str);
region->end[i] = (int)((BIT_STATUS_AT(reg->bt_mem_end, i)
? STACK_AT(mem_end_stk[i])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[i])) - str);
: (UChar* )((void* )(UINTN)mem_end_stk[i])) - str);
}
else {
region->beg[i] = region->end[i] = ONIG_REGION_NOTPOS;
@@ -2082,7 +2082,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_MEMORY_START: MOP_IN(OP_MEMORY_START);
GET_MEMNUM_INC(mem, p);
mem_start_stk[mem] = (OnigStackIndex )((void* )s);
mem_start_stk[mem] = (OnigStackIndex )(UINTN)((void* )s);
MOP_OUT;
continue;
break;
@@ -2096,7 +2096,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_MEMORY_END: MOP_IN(OP_MEMORY_END);
GET_MEMNUM_INC(mem, p);
mem_end_stk[mem] = (OnigStackIndex )((void* )s);
mem_end_stk[mem] = (OnigStackIndex )(UINTN)((void* )s);
MOP_OUT;
continue;
break;
@@ -2113,13 +2113,13 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_MEMORY_END_REC: MOP_IN(OP_MEMORY_END_REC);
GET_MEMNUM_INC(mem, p);
mem_end_stk[mem] = (OnigStackIndex )((void* )s);
mem_end_stk[mem] = (OnigStackIndex )(UINTN)((void* )s);
STACK_GET_MEM_START(mem, stkp);
if (BIT_STATUS_AT(reg->bt_mem_start, mem))
mem_start_stk[mem] = GET_STACK_INDEX(stkp);
else
mem_start_stk[mem] = (OnigStackIndex )((void* )stkp->u.mem.pstr);
mem_start_stk[mem] = (OnigStackIndex )(UINTN)((void* )stkp->u.mem.pstr);
STACK_PUSH_MEM_END_MARK(mem);
MOP_OUT;
@@ -2153,11 +2153,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (BIT_STATUS_AT(reg->bt_mem_start, mem))
pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;
else
pstart = (UChar* )((void* )mem_start_stk[mem]);
pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
: (UChar* )((void* )(UINTN)mem_end_stk[mem]));
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;
@@ -2185,11 +2185,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (BIT_STATUS_AT(reg->bt_mem_start, mem))
pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;
else
pstart = (UChar* )((void* )mem_start_stk[mem]);
pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
: (UChar* )((void* )(UINTN)mem_end_stk[mem]));
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;
@@ -2217,11 +2217,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (BIT_STATUS_AT(reg->bt_mem_start, mem))
pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;
else
pstart = (UChar* )((void* )mem_start_stk[mem]);
pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
: (UChar* )((void* )(UINTN)mem_end_stk[mem]));
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;
@@ -2256,11 +2256,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (BIT_STATUS_AT(reg->bt_mem_start, mem))
pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;
else
pstart = (UChar* )((void* )mem_start_stk[mem]);
pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);
pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)
? STACK_AT(mem_end_stk[mem])->u.mem.pstr
: (UChar* )((void* )mem_end_stk[mem]));
: (UChar* )((void* )(UINTN)mem_end_stk[mem]));
n = (int)(pend - pstart);
DATA_ENSURE(n);
sprev = s;