Skip to contentSkip to conversation

ver_linux: Eliminate duplicate code in ldconfig processing logic

PATCH In review Alexander Kapshuk 1 participant 2 messages Jan 8, 2021 – Jan 22, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ver_linux: Eliminate duplicate code in ldconfig processing logic

The code that acquires the version strings for libc and libcpp is identical, as is the printversion call. The only difference being the name of the library being printed.

Refactor the code by unifying the bits that are common to both libraries.

---
 scripts/ver_linux | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
scripts/ver_linux +5 -7
index 0968a3070eff..a92acc703f9b 100755
@@ -15,7 +15,7 @@ BEGIN {
 
 	vernum = "[0-9]+([.]?[0-9]+)+"
 	libc = "libc[.]so[.][0-9]+$"
-	libcpp = "(libg|stdc)[+]+[.]so[.][0-9]+$"
+	libcpp = "(libg|stdc)[+]+[.]so([.][0-9]+)+$"
 
 	printversion("GNU C", version("gcc -dumpversion"))
 	printversion("GNU Make", version("make --version"))
@@ -37,12 +37,10 @@ BEGIN {
 	printversion("Bison", version("bison --version"))
 	printversion("Flex", version("flex --version"))
 
-	while ("ldconfig -p 2>/dev/null" | getline > 0) {
-		if ($NF ~ libc && !seen[ver = version("readlink " $NF)]++)
-			printversion("Linux C Library", ver)
-		else if ($NF ~ libcpp && !seen[ver = version("readlink " $NF)]++)
-			printversion("Linux C++ Library", ver)
-	}
+	while ("ldconfig -p 2>/dev/null" | getline > 0)
+		if ($NF ~ libc || $NF ~ libcpp)
+			if (!seen[ver = version("readlink " $NF)]++)
+				printversion("Linux C" ($NF ~ libcpp? "++" : "") " Library", ver)
 
 	printversion("Dynamic linker (ldd)", version("ldd --version"))
 	printversion("Procps", version("ps --version"))

--
2.30.0

#1 lore raw
Quoted 43 lines · Alexander Kapshuk

The code that acquires the version strings for libc and libcpp is identical, as is the printversion call. The only difference being the name of the library being printed.

Refactor the code by unifying the bits that are common to both libraries.

---
 scripts/ver_linux | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
scripts/ver_linux +5 -8
index 0968a3070eff..a92acc703f9b 100755
@@ -15,7 +15,7 @@ BEGIN {
 
        vernum = "[0-9]+([.]?[0-9]+)+"
        libc = "libc[.]so[.][0-9]+$"
-       libcpp = "(libg|stdc)[+]+[.]so[.][0-9]+$"
+       libcpp = "(libg|stdc)[+]+[.]so([.][0-9]+)+$"
 
        printversion("GNU C", version("gcc -dumpversion"))
        printversion("GNU Make", version("make --version"))
@@ -37,12 +37,10 @@ BEGIN {
        printversion("Bison", version("bison --version"))
        printversion("Flex", version("flex --version"))
 
-       while ("ldconfig -p 2>/dev/null" | getline > 0) {
-               if ($NF ~ libc && !seen[ver = version("readlink " $NF)]++)
-                       printversion("Linux C Library", ver)
-               else if ($NF ~ libcpp && !seen[ver = version("readlink " $NF)]++)
-                       printversion("Linux C++ Library", ver)
-       }
+       while ("ldconfig -p 2>/dev/null" | getline > 0)
+               if ($NF ~ libc || $NF ~ libcpp)
+                       if (!seen[ver = version("readlink " $NF)]++)
+                               printversion("Linux C" ($NF ~ libcpp? "++" : "") " Library", ver)
 
        printversion("Dynamic linker (ldd)", version("ldd --version"))
        printversion("Procps", version("ps --version"))
--
Quoted 2 lines

2.30.0

I'd appreciate getting some feedback on the patch in question at your convenience.