diff --git a/scripts/base/misc/version.bro b/scripts/base/misc/version.bro index d5e26ed518..7c91da116f 100644 --- a/scripts/base/misc/version.bro +++ b/scripts/base/misc/version.bro @@ -44,7 +44,7 @@ export { ## version_string: Version to check against the current running version. ## ## Returns: True if running version greater or equal to the given version. - global greater_equal: function(version_string: string): bool; + global at_least: function(version_string: string): bool; } function parse(version_string: string): VersionDescription @@ -78,13 +78,13 @@ export { ## The format of the number is ABBCC with A being the major version, ## bb being the minor version (2 digits) and CC being the patchlevel (2 digits). ## As an example, Bro 2.4.1 results in the number 20401 - const num = Version::parse(bro_version())$version_num; + const number = Version::parse(bro_version())$version_num; ## `VersionDescription` record pertaining to the currently running version of Bro. const info = Version::parse(bro_version()); } -function greater_equal(version_string: string): bool +function at_least(version_string: string): bool { - return Version::parse(version_string)$version_num >= Version::num; + return Version::parse(version_string)$version_num >= Version::number; } diff --git a/testing/btest/scripts/base/misc/version.bro b/testing/btest/scripts/base/misc/version.bro index 43d78a6662..c0f0d0772c 100644 --- a/testing/btest/scripts/base/misc/version.bro +++ b/testing/btest/scripts/base/misc/version.bro @@ -23,7 +23,7 @@ Version::parse(bro_version()); @TEST-START-NEXT -@if ( Version::num >= 20500 ) +@if ( Version::number >= 20500 ) print "yup"; @endif @@ -31,10 +31,10 @@ print "yup"; print "yup"; @endif -@if ( Version::greater_equal("2.5") ) +@if ( Version::at_least("2.5") ) print "yup"; @endif -@if ( Version::greater_equal("2.4") ) +@if ( Version::at_least("2.4") ) print "no"; @endif