Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/markoverholser/zeek

Browse source 
* 'master' of https://github.com/markoverholser/zeek:
  Update zeek.bif documentation for to_count and to_int
This commit is contained in:
Arne Welzel 2025-03-04 12:07:01 +01:00
commit 548a12813a
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES
View file

@ -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)

2
VERSION
View file

@ -1 +1 @@
7.2.0-dev.244
7.2.0-dev.250

10
src/zeek.bif
View file

@ -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.
##

2
testing/external/commit-hash.zeek-testing-private vendored
View file

@ -1 +1 @@
296a3b2bfd36a74c8aa22f175cea4c00a9f4d079
f65f5f0d5f51d6bf73ea6b7ad70c8f962d7d427c