tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: StrGather simplify string/int conversion functions 

use ''.format instead of eval() and use some list comprehension for making list
delete some unused variables

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben 2018-03-16 05:39:05 +08:00 committed by Yonghong Zhu
parent afb04ba198
commit 549c59b30c
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BaseTools/Source/Python/AutoGen/StrGather.py
View File

@ -59,9 +59,6 @@ NOT_REFERENCED = 'not referenced'
COMMENT_NOT_REFERENCED = ' ' + COMMENT + NOT_REFERENCED COMMENT_NOT_REFERENCED = ' ' + COMMENT + NOT_REFERENCED
CHAR_ARRAY_DEFIN = 'unsigned char' CHAR_ARRAY_DEFIN = 'unsigned char'
COMMON_FILE_NAME = 'Strings' COMMON_FILE_NAME = 'Strings'
OFFSET = 'offset'
STRING = 'string'
TO = 'to'
STRING_TOKEN = re.compile('STRING_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE) STRING_TOKEN = re.compile('STRING_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)
EFI_HII_ARRAY_SIZE_LENGTH = 4 EFI_HII_ARRAY_SIZE_LENGTH = 4
@ -97,7 +94,7 @@ PRINTABLE_LANGUAGE_NAME_STRING_NAME = '$PRINTABLE_LANGUAGE_NAME'
# @retval: The formatted hex string # @retval: The formatted hex string
# #
def DecToHexStr(Dec, Digit = 8): def DecToHexStr(Dec, Digit = 8):
return eval("'0x%0" + str(Digit) + "X' % int(Dec)") return '0x{0:0{1}X}'.format(Dec,Digit)
## Convert a dec number to a hex list ## Convert a dec number to a hex list
# #
@ -112,11 +109,8 @@ def DecToHexStr(Dec, Digit = 8):
# @retval: A list for formatted hex string # @retval: A list for formatted hex string
# #
def DecToHexList(Dec, Digit = 8): def DecToHexList(Dec, Digit = 8):
Hex = eval("'%0" + str(Digit) + "X' % int(Dec)") Hex = '{0:0{1}X}'.format(Dec,Digit)
List = [] return ["0x" + Hex[Bit:Bit + 2] for Bit in range(Digit - 2, -1, -2)]
for Bit in range(Digit - 2, -1, -2):
List.append(HexHeader + Hex[Bit:Bit + 2])
return List
## Convert a acsii string to a hex list ## Convert a acsii string to a hex list
# #
@ -128,11 +122,7 @@ def DecToHexList(Dec, Digit = 8):
# @retval: A list for formatted hex string # @retval: A list for formatted hex string
# #
def AscToHexList(Ascii): def AscToHexList(Ascii):
List = [] return ['0x{0:02X}'.format(ord(Item)) for Item in Ascii]
for Item in Ascii:
List.append('0x%02X' % ord(Item))
return List
## Create header of .h file ## Create header of .h file
# #