From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030757AbbJ3LZ4 (ORCPT ); Fri, 30 Oct 2015 07:25:56 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:56461 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759323AbbJ3LZz (ORCPT ); Fri, 30 Oct 2015 07:25:55 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-30-563353c197d0 From: shailendra.v@samsung.com To: Andy Whitcroft , Joe Perches Cc: linux-kernel@vger.kernel.org Subject: [PATCH] scripts:checkpatch - correct the error message during check Date: Fri, 30 Oct 2015 16:55:04 +0530 Message-id: <1446204304-23107-1-git-send-email-shailendra.v@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t9jQd2DwcZhBuv/yFh8WKthMfv+YxaL y7vmsDkwe8xq6GXz+LLqGrPH501yAcxRXDYpqTmZZalF+nYJXBnNH/YwFvznrvi4oJOxgfE6 ZxcjJ4eEgInE442fmCBsMYkL99azdTFycQgJzGKUWHB3EwuE85pR4sWJs6wgVWwCchLnJk1m BrFFBFwl1v6bAtbNLKAg8eveJqAaDg5hAR+JXetsQcIsAqoSnXNvsIHYvAIeEvu3LGcCKZEA Kp8zyQYkzCkgKzG3cwHYFCEBGYlP61YwTWDkXcDIsIpRIrUguaA4KT3XMC+1XK84Mbe4NC9d Lzk/dxMjODSeSe1gPLjL/RCjAAejEg/vjwSjMCHWxLLiytxDjBIczEoivD1OxmFCvCmJlVWp RfnxRaU5qcWHGKU5WJTEefU9gaoF0hNLUrNTUwtSi2CyTBycUg2M6dNtIq7LyCoFphlG3Xkf tyPuw9kKz4/XhTbWWXI/3G3paDrP6tyiXkfdXOZWq2mz/WZoPTyoanf8hvTvdcsUmipiu3QK FwcGGaiHqasKfj+y9nzxlySDsIOrGNbGdbixWsnFatonnY5r4j4cOeeThdKFjCSRBLm/25PW G7xfvJ7J7Mjc9ndKLMUZiYZazEXFiQA0oZJWCQIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shailendra Verma Signed-off-by: Shailendra Verma --- scripts/checkpatch.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index c5ec977..b2436d3 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3169,21 +3169,21 @@ sub process { } # check for global initialisers. - if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0|NULL|false)\s*;/) { + if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(0x0|0|NULL|false)\s*;/) { if (ERROR("GLOBAL_INITIALISERS", - "do not initialise globals to 0 or NULL\n" . + "do not initialise globals to $1\n" . $herecurr) && $fix) { - $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*(0|NULL|false)\s*;/$1;/; + $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*(0x0|0|NULL|false)\s*;/$1;/; } } # check for static initialisers. - if ($line =~ /^\+.*\bstatic\s.*=\s*(0|NULL|false)\s*;/) { + if ($line =~ /^\+.*\bstatic\s.*=\s*(0x0|0|NULL|false)\s*;/) { if (ERROR("INITIALISED_STATIC", - "do not initialise statics to 0 or NULL\n" . + "do not initialise statics to $1\n" . $herecurr) && $fix) { - $fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*(0|NULL|false)\s*;/$1;/; + $fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*(0x0|0|NULL|false)\s*;/$1;/; } } -- 1.9.1