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

Fix variable shadowing issues reported by LGTM

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-03-03 09:57:16 -07:00
parent 59b40168fb
commit 2f2a265415
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/CompHash.cc
View file

@ -187,14 +187,14 @@ char* CompositeHash::SingleValHash(bool type_check, char* kp0,
auto rv_i = rv->GetField(i).get();
Attributes* a = rt->FieldDecl(i)->attrs.get();
bool optional = (a && a->Find(ATTR_OPTIONAL));
bool optional_attr = (a && a->Find(ATTR_OPTIONAL));
if ( ! (rv_i || optional) )
if ( ! (rv_i || optional_attr) )
return nullptr;
if ( ! (kp = SingleValHash(type_check, kp,
rt->GetFieldType(i).get(),
rv_i, optional)) )
rv_i, optional_attr)) )
return nullptr;
}
@ -292,9 +292,9 @@ char* CompositeHash::SingleValHash(bool type_check, char* kp0,
kp1 = reinterpret_cast<char*>(kp+1);
for ( int i = 0; i < lv->Length(); ++i )
{
Val* v = lv->Idx(i).get();
if ( ! (kp1 = SingleValHash(type_check, kp1, v->GetType().get(), v,
false)) )
Val* entry_val = lv->Idx(i).get();
if ( ! (kp1 = SingleValHash(type_check, kp1, entry_val->GetType().get(),
entry_val, false)) )
return nullptr;
}
}
@ -515,11 +515,11 @@ int CompositeHash::SingleTypeKeySize(Type* bt, const Val* v,
for ( int i = 0; i < num_fields; ++i )
{
Attributes* a = rt->FieldDecl(i)->attrs.get();
bool optional = (a && a->Find(ATTR_OPTIONAL));
bool optional_attr = (a && a->Find(ATTR_OPTIONAL));
sz = SingleTypeKeySize(rt->GetFieldType(i).get(),
rv ? rv->GetField(i).get() : nullptr,
type_check, sz, optional,
type_check, sz, optional_attr,
calc_static_size);
if ( ! sz )
return 0;