Browse code

Improve the way we format version definitions.

Indeed, it appears that, for a given version definition having multiple
auxiliary entries (verdaux), the first entry is the version specification
itself and the other ones are its dependencies.
Dependencies between version nodes are checked at compile-time only.

Xavier G authored on23/08/2015 23:57:13
Showing1 changed files

  • elfwalk index b107fbf..d128ca8 100755
... ...
@@ -2223,7 +2223,11 @@ sub formatVersionDefinition {
2223 2223
 	for (my $i = 0; $i < $verdef->{'vd_cnt'}; ++ $i) {
2224 2224
 		push(@verdef_strings, $verdef->{'verdaux'}->{$i}->{'name'});
2225 2225
 	}
2226
-	return join(' / ', @verdef_strings);
2226
+	my $str = shift(@verdef_strings);
2227
+	if (scalar(@verdef_strings)) {
2228
+		$str .= sprintf(' (deps: %s)', join(', ', @verdef_strings));
2229
+	}
2230
+	return $str;
2227 2231
 }
2228 2232
 
2229 2233
 sub formatVersionRequirement {