Fix short name generation

Should only replace first occurrence of prefix in the string.
Also only strips the prefix if it saves more than 2 characters.

This fixes a bug where, e.g., 'casnDisconnect' would be shortened to 'asnDisonnet'.
This commit is contained in:
Paul Gear
2016-01-17 13:57:34 +10:00
parent a7c0c1b762
commit 9e9f5f787f

View File

@@ -1189,8 +1189,10 @@ function load_mibdefs($module, $name)
// add shortname to each element
$prefix = longest_matching_prefix($name, $object_types);
foreach ($result as $mib => $m) {
$result[$mib]['shortname'] = str_replace($prefix, '', $m['object_type']);
if (strlen($prefix) > 2) {
foreach ($result as $mib => $m) {
$result[$mib]['shortname'] = preg_replace("/^$prefix/", '', $m['object_type'], 1);
}
}
d_print_r($result);