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

Merge remote-tracking branch 'origin/topic/vern/line-number-ordering'

Browse source 
* origin/topic/vern/line-number-ordering:
  Bump ZeekJS to work with new Location constructor
  remove non-functional column information from Location objects
  isolate Location specifics to private class variables to enforce correct line number ordering
This commit is contained in:
Arne Welzel 2025-07-08 10:40:45 +02:00
commit d42d467965
35 changed files with 176 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
testing/btest/plugins/plugin-load-file-extended/src/Plugin.cc
View file

@ -24,7 +24,7 @@ std::pair<int, std::optional<std::string>> Plugin::HookLoadFileExtended(const Lo
const std::string& resolved) {
// Zeek implicitly provides the location where the current '@load'
// originated. If no location is available, filename will be a nullptr.
auto src = zeek::detail::GetCurrentLocation().filename;
auto src = zeek::detail::GetCurrentLocation().FileName();
if ( ! src )
src = "n/a";