X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FAutoGen%2FStrGather.py;h=9c7dd1e40374adf45080909a6f0b34f807c8a884;hp=0e0e9bd74d9d8ccbc95729d72ddf5c65e48abe23;hb=4d83616f9d7731934e7f91058efb165a2bc5b9d7;hpb=afb04ba198799e1a377e7518965c7eb29c26732b

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index 0e0e9bd74d..9c7dd1e403 100644
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -59,9 +59,6 @@ NOT_REFERENCED = 'not referenced'
 COMMENT_NOT_REFERENCED = ' ' + COMMENT + NOT_REFERENCED
 CHAR_ARRAY_DEFIN = 'unsigned char'
 COMMON_FILE_NAME = 'Strings'
-OFFSET = 'offset'
-STRING = 'string'
-TO = 'to'
 STRING_TOKEN = re.compile('STRING_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)
 
 EFI_HII_ARRAY_SIZE_LENGTH = 4
@@ -97,7 +94,7 @@ PRINTABLE_LANGUAGE_NAME_STRING_NAME = '$PRINTABLE_LANGUAGE_NAME'
 # @retval:       The formatted hex string
 #
 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
 #
@@ -112,11 +109,8 @@ def DecToHexStr(Dec, Digit = 8):
 # @retval:       A list for formatted hex string
 #
 def DecToHexList(Dec, Digit = 8):
-    Hex = eval("'%0" + str(Digit) + "X' % int(Dec)")
-    List = []
-    for Bit in range(Digit - 2, -1, -2):
-        List.append(HexHeader + Hex[Bit:Bit + 2])
-    return List
+    Hex = '{0:0{1}X}'.format(Dec,Digit)
+    return ["0x" + Hex[Bit:Bit + 2] for Bit in range(Digit - 2, -1, -2)]
 
 ## Convert a acsii string to a hex list
 #
@@ -128,27 +122,7 @@ def DecToHexList(Dec, Digit = 8):
 # @retval:       A list for formatted hex string
 #
 def AscToHexList(Ascii):
-    List = []
-    for Item in Ascii:
-        List.append('0x%02X' % ord(Item))
-
-    return List
-
-## Create header of .h file
-#
-# Create a header of .h file
-#
-# @param BaseName: The basename of strings
-#
-# @retval Str:     A string for .h file header
-#
-def CreateHFileHeader(BaseName):
-    Str = ''
-    for Item in H_C_FILE_HEADER:
-        Str = WriteLine(Str, Item)
-    Str = WriteLine(Str, '#ifndef _' + BaseName.upper() + '_STRINGS_DEFINE_H_')
-    Str = WriteLine(Str, '#define _' + BaseName.upper() + '_STRINGS_DEFINE_H_')
-    return Str
+    return ['0x{0:02X}'.format(ord(Item)) for Item in Ascii]
 
 ## Create content of .h file
 #
@@ -214,19 +188,6 @@ def CreateHFile(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag):
 
     return HFile
 
-## Create header of .c file
-#
-# Create a header of .c file
-#
-# @retval Str:     A string for .c file header
-#
-def CreateCFileHeader():
-    Str = ''
-    for Item in H_C_FILE_HEADER:
-        Str = WriteLine(Str, Item)
-
-    return Str
-
 ## Create a buffer to store all items in an array
 #
 # @param BinBuffer   Buffer to contain Binary data.
@@ -503,7 +464,6 @@ def CreateCFileEnd():
 #
 def CreateCFile(BaseName, UniObjectClass, IsCompatibleMode, FilterInfo):
     CFile = ''
-    #CFile = WriteLine(CFile, CreateCFileHeader())
     CFile = WriteLine(CFile, CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, None, FilterInfo))
     CFile = WriteLine(CFile, CreateCFileEnd())
     return CFile