mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Thu 05 Oct 2017 15:25:21 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: checkpatch: fix incompatibility with old perl Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
@@ -1432,7 +1432,8 @@ sub process {
|
||||
qr/%[-+ *.0-9]*([hljztL]|ll|hh)?(x|X|"\s*PRI[xX][^"]*"?)/;
|
||||
|
||||
# don't consider groups splitted by [.:/ ], like 2A.20:12ab
|
||||
my $tmpline = $rawline =~ s/($hex[.:\/ ])+$hex//gr;
|
||||
my $tmpline = $rawline;
|
||||
$tmpline =~ s/($hex[.:\/ ])+$hex//g;
|
||||
|
||||
if ($tmpline =~ /(?<!0x)$hex/) {
|
||||
ERROR("Hex numbers must be prefixed with '0x'\n" .
|
||||
|
||||
Reference in New Issue
Block a user