diff --git a/CHANGES b/CHANGES index 1eab6948d6..8e9f2eb6a3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +7.2.0-dev.250 | 2025-03-04 12:07:01 +0100 + + * Update zeek.bif documentation for to_count and to_int (Mark Overholser) + + * CI: Add release-build ZAM task for baseline checks during PRs (Tim Wojtulewicz, Corelight) + + * Fix language/assert btest baselines for to_count/to_int changes (Tim Wojtulewicz, Corelight) + + * Update the bifs.to_count baseline for ZAM (Tim Wojtulewicz, Corelight) + 7.2.0-dev.244 | 2025-03-04 09:40:41 +0100 * GH-2311: scan.l: Fix @load-plugin scripts loading (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index 14e6b8bac6..0e0884d2bd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0-dev.244 +7.2.0-dev.250 diff --git a/src/zeek.bif b/src/zeek.bif index 7d9320ad3b..510856f7b5 100644 --- a/src/zeek.bif +++ b/src/zeek.bif @@ -2601,10 +2601,13 @@ function enum_to_int%(e: any%): int return zeek::val_mgr->Int(e->AsEnum()); %} -## Converts a :zeek:type:`string` to an :zeek:type:`int`. +## Converts a :zeek:type:`string` to an :zeek:type:`int`. For values where +## ``base`` is set to 16, a prefix of ``0x`` or ``0X`` will be ignored. ## ## str: The :zeek:type:`string` to convert. ## +## base: The :zeek:type:`count` to use as the numeric base. +## ## Returns: The :zeek:type:`string` *str* as :zeek:type:`int`. ## ## .. zeek:see:: to_addr to_port to_subnet @@ -2668,10 +2671,13 @@ function double_to_count%(d: double%): count return zeek::val_mgr->Count(zeek_uint_t(rint(d))); %} -## Converts a :zeek:type:`string` to a :zeek:type:`count`. +## Converts a :zeek:type:`string` to a :zeek:type:`count`. For values where +## ``base`` is set to 16, a prefix of ``0x`` or ``0X`` will be ignored. ## ## str: The :zeek:type:`string` to convert. ## +## base: The :zeek:type:`count` to use as the numeric base. +## ## Returns: The :zeek:type:`string` *str* as unsigned integer, or 0 if *str* has ## an invalid format. ## diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private index 48b931a063..cbe8377f15 100644 --- a/testing/external/commit-hash.zeek-testing-private +++ b/testing/external/commit-hash.zeek-testing-private @@ -1 +1 @@ -296a3b2bfd36a74c8aa22f175cea4c00a9f4d079 +f65f5f0d5f51d6bf73ea6b7ad70c8f962d7d427c