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

Fix coding conventions nits/typos

Browse source
This commit is contained in:
Jon Siwek 2018-11-07 10:27:00 -06:00
parent f470dfdb92
commit 808f1d1524
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-beta2-79 | 2018-11-07 10:27:00 -0600
* Fix coding conventions nits/typos (Vern Paxson, Corelight)
2.6-beta2-77 | 2018-11-06 09:32:17 -0600 2.6-beta2-77 | 2018-11-06 09:32:17 -0600
* Switch GridFTP options from redef to option (Vlad Grigorescu) * Switch GridFTP options from redef to option (Vlad Grigorescu)

2
VERSION
View file

@ -1 +1 @@
2.6-beta2-77 2.6-beta2-79

4
src/Conn.cc
View file

@ -412,7 +412,7 @@ RecordVal* Connection::BuildConnVal()
id_val->Assign(2, new AddrVal(resp_addr)); id_val->Assign(2, new AddrVal(resp_addr));
id_val->Assign(3, port_mgr->Get(ntohs(resp_port), prot_type)); id_val->Assign(3, port_mgr->Get(ntohs(resp_port), prot_type));
RecordVal *orig_endp = new RecordVal(endpoint); RecordVal* orig_endp = new RecordVal(endpoint);
orig_endp->Assign(0, new Val(0, TYPE_COUNT)); orig_endp->Assign(0, new Val(0, TYPE_COUNT));
orig_endp->Assign(1, new Val(0, TYPE_COUNT)); orig_endp->Assign(1, new Val(0, TYPE_COUNT));
orig_endp->Assign(4, new Val(orig_flow_label, TYPE_COUNT)); orig_endp->Assign(4, new Val(orig_flow_label, TYPE_COUNT));
@ -423,7 +423,7 @@ RecordVal* Connection::BuildConnVal()
if ( memcmp(&orig_l2_addr, &null, l2_len) != 0 ) if ( memcmp(&orig_l2_addr, &null, l2_len) != 0 )
orig_endp->Assign(5, new StringVal(fmt_mac(orig_l2_addr, l2_len))); orig_endp->Assign(5, new StringVal(fmt_mac(orig_l2_addr, l2_len)));
RecordVal *resp_endp = new RecordVal(endpoint); RecordVal* resp_endp = new RecordVal(endpoint);
resp_endp->Assign(0, new Val(0, TYPE_COUNT)); resp_endp->Assign(0, new Val(0, TYPE_COUNT));
resp_endp->Assign(1, new Val(0, TYPE_COUNT)); resp_endp->Assign(1, new Val(0, TYPE_COUNT));
resp_endp->Assign(4, new Val(resp_flow_label, TYPE_COUNT)); resp_endp->Assign(4, new Val(resp_flow_label, TYPE_COUNT));

2
src/parse.y
View file

@ -990,7 +990,7 @@ type:
{ {
NullStmt here; NullStmt here;
if ( $1 ) if ( $1 )
$1->Error("not a BRO type", &here); $1->Error("not a Bro type", &here);
$$ = error_type(); $$ = error_type();
} }
else else