diff options
| author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2019-01-05 12:09:23 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-22 07:34:35 -0500 |
| commit | 2ca46ed207d5d4e3c7a183fe11e8a2d02f86e7c6 (patch) | |
| tree | 74ee264317a24e7bfbad66c327380462f28e286d /scripts | |
| parent | d7ac3c6ef5d8ce14b6381d52eb7adafdd6c8bb3c (diff) | |
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: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ver_linux | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index a6c728db05ce..810e608baa24 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux | |||
| @@ -13,6 +13,8 @@ BEGIN { | |||
| 13 | system("uname -a") | 13 | system("uname -a") |
| 14 | printf("\n") | 14 | printf("\n") |
| 15 | 15 | ||
| 16 | vernum = "[0-9]+([.]?[0-9]+)+" | ||
| 17 | |||
| 16 | printversion("GNU C", version("gcc -dumpversion")) | 18 | printversion("GNU C", version("gcc -dumpversion")) |
| 17 | printversion("GNU Make", version("make --version")) | 19 | printversion("GNU Make", version("make --version")) |
| 18 | printversion("Binutils", version("ld -v")) | 20 | printversion("Binutils", version("ld -v")) |
| @@ -34,7 +36,7 @@ BEGIN { | |||
| 34 | while (getline <"/proc/self/maps" > 0) { | 36 | while (getline <"/proc/self/maps" > 0) { |
| 35 | if (/libc.*\.so$/) { | 37 | if (/libc.*\.so$/) { |
| 36 | n = split($0, procmaps, "/") | 38 | n = split($0, procmaps, "/") |
| 37 | if (match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) { | 39 | if (match(procmaps[n], vernum)) { |
| 38 | ver = substr(procmaps[n], RSTART, RLENGTH) | 40 | ver = substr(procmaps[n], RSTART, RLENGTH) |
| 39 | printversion("Linux C Library", ver) | 41 | printversion("Linux C Library", ver) |
| 40 | break | 42 | break |
| @@ -70,7 +72,7 @@ BEGIN { | |||
| 70 | function version(cmd, ver) { | 72 | function version(cmd, ver) { |
| 71 | cmd = cmd " 2>&1" | 73 | cmd = cmd " 2>&1" |
| 72 | while (cmd | getline > 0) { | 74 | while (cmd | getline > 0) { |
| 73 | if (match($0, /[0-9]+([.]?[0-9]+)+/)) { | 75 | if (match($0, vernum)) { |
| 74 | ver = substr($0, RSTART, RLENGTH) | 76 | ver = substr($0, RSTART, RLENGTH) |
| 75 | break | 77 | break |
| 76 | } | 78 | } |
