Reviewed-by: Bob Feng <[email protected]> -----Original Message----- From: edk2-devel [mailto:[email protected]] On Behalf Of Feng, Bob C Sent: Wednesday, January 30, 2019 4:49 PM To: [email protected] Cc: Chen, Hess <[email protected]> Subject: [edk2] [PATCH] BaseTools/ECC: Add a new type of exception
From: Hess Chen <[email protected]> Add a new type of exception for function body checkpoint. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen <[email protected]> --- BaseTools/Source/Python/Ecc/c.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py index b8d6adde16..577d92744c 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -1,7 +1,7 @@ ## @file # This file is used to be the c coding style checking of ECC tool # -# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2009 - 2019, Intel Corporation. All rights +reserved.<BR> # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -1511,7 +1511,7 @@ def CheckFuncLayoutBody(FullFileName): FileTable = 'Identifier' + str(FileID) Db = GetDB() - SqlStatement = """ select BodyStartColumn, EndColumn, ID + SqlStatement = """ select BodyStartColumn, EndColumn, ID, Name from Function where BelongsToFile = %d """ % (FileID) @@ -1520,9 +1520,15 @@ def CheckFuncLayoutBody(FullFileName): return ErrorMsgList for Result in ResultSet: if Result[0] != 0: - PrintErrorMsg(ERROR_C_FUNCTION_LAYOUT_CHECK_FUNCTION_BODY, 'open brace should be at the very beginning of a line.', 'Function', Result[2]) + if not EccGlobalData.gException.IsException(ERROR_C_FUNCTION_LAYOUT_CHECK_FUNCTION_BODY, Result[3]): + PrintErrorMsg(ERROR_C_FUNCTION_LAYOUT_CHECK_FUNCTION_BODY, + 'The open brace should be at the very beginning of a line for the function [%s].' % Result[3], + 'Function', Result[2]) if Result[1] != 0: - PrintErrorMsg(ERROR_C_FUNCTION_LAYOUT_CHECK_FUNCTION_BODY, 'close brace should be at the very beginning of a line.', 'Function', Result[2]) + if not EccGlobalData.gException.IsException(ERROR_C_FUNCTION_LAYOUT_CHECK_FUNCTION_BODY, Result[3]): + PrintErrorMsg(ERROR_C_FUNCTION_LAYOUT_CHECK_FUNCTION_BODY, + 'The close brace should be at the very beginning of a line for the function [%s].' % Result[3], + 'Function', Result[2]) def CheckFuncLayoutLocalVariable(FullFileName): ErrorMsgList = [] -- 2.14.2.windows.2 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
