From 5eb0da0568a241f72732eb2143538fb14879a52c Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 29 Jan 2018 14:33:49 +1100 Subject: leaking_addresses: add is_arch() wrapper subroutine Currently there is duplicate code when checking the architecture type. We can remove the duplication by implementing a wrapper function is_arch(). Implement and use wrapper function is_arch(). Signed-off-by: Tobin C. Harding --- scripts/leaking_addresses.pl | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'scripts/leaking_addresses.pl') diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index 56894daf6368..e5b418cca185 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -170,24 +170,26 @@ sub is_supported_architecture return (is_x86_64() or is_ppc64()); } -sub is_x86_64 +sub is_arch { - my $archname = `uname -m`; + my ($desc) = @_; + my $arch = `uname -m`; + + chomp $arch; + if ($arch eq $desc) { + return 1; + } + return 0; +} - if ($archname =~ m/x86_64/) { - return 1; - } - return 0; +sub is_x86_64 +{ + return is_arch('x86_64'); } sub is_ppc64 { - my $archname = `uname -m`; - - if ($archname =~ m/ppc64/) { - return 1; - } - return 0; + return is_arch('ppc64'); } # Gets config option value from kernel config file. -- cgit