Commit 2ca46ed2 authored by Alexander Kapshuk's avatar Alexander Kapshuk Committed by Greg Kroah-Hartman

ver_linux: Assign constant RE to variable name for clarity

The regular expression that matches the version number of a utility
being queried is used as a constant expression in the current
implementation. Assigning the RE in question to a variable gives it a
meaningful name that clearly expresses the intended use of the expression
without having to think about the details of implementation.
Signed-off-by: default avatarAlexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7ac3c6e
...@@ -13,6 +13,8 @@ BEGIN { ...@@ -13,6 +13,8 @@ BEGIN {
system("uname -a") system("uname -a")
printf("\n") printf("\n")
vernum = "[0-9]+([.]?[0-9]+)+"
printversion("GNU C", version("gcc -dumpversion")) printversion("GNU C", version("gcc -dumpversion"))
printversion("GNU Make", version("make --version")) printversion("GNU Make", version("make --version"))
printversion("Binutils", version("ld -v")) printversion("Binutils", version("ld -v"))
...@@ -34,7 +36,7 @@ BEGIN { ...@@ -34,7 +36,7 @@ BEGIN {
while (getline <"/proc/self/maps" > 0) { while (getline <"/proc/self/maps" > 0) {
if (/libc.*\.so$/) { if (/libc.*\.so$/) {
n = split($0, procmaps, "/") n = split($0, procmaps, "/")
if (match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) { if (match(procmaps[n], vernum)) {
ver = substr(procmaps[n], RSTART, RLENGTH) ver = substr(procmaps[n], RSTART, RLENGTH)
printversion("Linux C Library", ver) printversion("Linux C Library", ver)
break break
...@@ -70,7 +72,7 @@ BEGIN { ...@@ -70,7 +72,7 @@ BEGIN {
function version(cmd, ver) { function version(cmd, ver) {
cmd = cmd " 2>&1" cmd = cmd " 2>&1"
while (cmd | getline > 0) { while (cmd | getline > 0) {
if (match($0, /[0-9]+([.]?[0-9]+)+/)) { if (match($0, vernum)) {
ver = substr($0, RSTART, RLENGTH) ver = substr($0, RSTART, RLENGTH)
break break
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment