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

GH-172: fix broxygen not merging bif and script identifier comments

Browse source 
Fixes GH-172
This commit is contained in:
Jon Siwek 2019-01-15 12:12:09 -06:00
parent 12f3ab303b
commit 6eee5ded61
6 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-76 | 2019-01-15 12:12:09 -0600
* GH-172: fix broxygen not merging bif and script identifier comments (Jon Siwek, Corelight)
2.6-75 | 2019-01-15 10:30:06 -0600 2.6-75 | 2019-01-15 10:30:06 -0600
* GH-213: change type of vector for-loop index to a count (Jon Siwek, Corelight) * GH-213: change type of vector for-loop index to a count (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.6-75 2.6-76

3
doc/scripts/base/frameworks/input/main.bro.rst
View file

@ -36,7 +36,7 @@ Types
========================================================== =================================================================== ========================================================== ===================================================================
:bro:type:`Input::AnalysisDescription`: :bro:type:`record` A file analysis input stream type used to forward input data to the :bro:type:`Input::AnalysisDescription`: :bro:type:`record` A file analysis input stream type used to forward input data to the
file analysis framework. file analysis framework.
:bro:type:`Input::Event`: :bro:type:`enum` :bro:type:`Input::Event`: :bro:type:`enum` Type that describes what kind of change occurred.
:bro:type:`Input::EventDescription`: :bro:type:`record` An event input stream type used to send input data to a Bro event. :bro:type:`Input::EventDescription`: :bro:type:`record` An event input stream type used to send input data to a Bro event.
:bro:type:`Input::Mode`: :bro:type:`enum` Type that defines the input stream read mode. :bro:type:`Input::Mode`: :bro:type:`enum` Type that defines the input stream read mode.
:bro:type:`Input::TableDescription`: :bro:type:`record` A table input stream type used to send data to a Bro table. :bro:type:`Input::TableDescription`: :bro:type:`record` A table input stream type used to send data to a Bro table.
@ -182,6 +182,7 @@ Types
Previously existing data has been removed. Previously existing data has been removed.
Type that describes what kind of change occurred.
.. bro:type:: Input::EventDescription .. bro:type:: Input::EventDescription

1
src/broker/comm.bif
View file

@ -40,7 +40,6 @@ enum ErrorCode %{
CAF_ERROR = 100, CAF_ERROR = 100,
%} %}
## The possible states of a peer endpoint.
enum PeerStatus %{ enum PeerStatus %{
INITIALIZING, INITIALIZING,
CONNECTING, CONNECTING,

1
src/broker/store.bif
View file

@ -28,7 +28,6 @@ type Broker::QueryResult: record;
type Broker::BackendOptions: record; type Broker::BackendOptions: record;
## Enumerates the possible storage backends.
enum BackendType %{ enum BackendType %{
MEMORY, MEMORY,
SQLITE, SQLITE,

11
src/broxygen/Manager.cc
View file

@ -211,7 +211,8 @@ void Manager::ModuleUsage(const string& path, const string& module)
IdentifierInfo* Manager::CreateIdentifierInfo(ID* id, ScriptInfo* script) IdentifierInfo* Manager::CreateIdentifierInfo(ID* id, ScriptInfo* script)
{ {
IdentifierInfo* rval = new IdentifierInfo(id, script); auto prev = identifiers.GetInfo(id->Name());
IdentifierInfo* rval = prev ? prev : new IdentifierInfo(id, script);
rval->AddComments(comment_buffer); rval->AddComments(comment_buffer);
comment_buffer.clear(); comment_buffer.clear();
@ -224,8 +225,12 @@ IdentifierInfo* Manager::CreateIdentifierInfo(ID* id, ScriptInfo* script)
comment_buffer_map.erase(it); comment_buffer_map.erase(it);
} }
all_info.push_back(rval); if ( ! prev )
identifiers.map[id->Name()] = rval; {
all_info.push_back(rval);
identifiers.map[id->Name()] = rval;
}
last_identifier_seen = rval; last_identifier_seen = rval;
if ( script ) if ( script )