mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 16:48:19 +00:00
addressed some Coverity nits
This commit is contained in:
parent
b0d9a841f5
commit
aab5324e20
7 changed files with 11 additions and 9 deletions
|
@ -2793,7 +2793,7 @@ void FieldExpr::Assign(Frame* f, ValPtr v) {
|
||||||
if ( IsError() )
|
if ( IsError() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Assign(op->Eval(f), v);
|
Assign(op->Eval(f), std::move(v));
|
||||||
}
|
}
|
||||||
|
|
||||||
void FieldExpr::Assign(ValPtr lhs, ValPtr rhs) {
|
void FieldExpr::Assign(ValPtr lhs, ValPtr rhs) {
|
||||||
|
@ -2807,7 +2807,7 @@ ValPtr FieldExpr::Delete(Frame* f) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
auto former = op_v->AsRecordVal()->GetField(field);
|
auto former = op_v->AsRecordVal()->GetField(field);
|
||||||
Assign(op_v, nullptr);
|
Assign(std::move(op_v), nullptr);
|
||||||
// In the future we could return a value, such as former, here.
|
// In the future we could return a value, such as former, here.
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -384,7 +384,7 @@ NameExprPtr Reducer::GetRetVar(TypePtr type) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
IDPtr ret_id = install_ID("@retvar", "<internal>", false, false);
|
IDPtr ret_id = install_ID("@retvar", "<internal>", false, false);
|
||||||
ret_id->SetType(type);
|
ret_id->SetType(std::move(type));
|
||||||
ret_id->GetOptInfo()->SetTemp();
|
ret_id->GetOptInfo()->SetTemp();
|
||||||
|
|
||||||
ret_vars.insert(ret_id.get());
|
ret_vars.insert(ret_id.get());
|
||||||
|
|
|
@ -321,7 +321,7 @@ private:
|
||||||
|
|
||||||
// Returns a handle to state associated with building
|
// Returns a handle to state associated with building
|
||||||
// up a list of values.
|
// up a list of values.
|
||||||
OpaqueVals* BuildVals(const ListExprPtr&);
|
std::unique_ptr<OpaqueVals> BuildVals(const ListExprPtr&);
|
||||||
|
|
||||||
// "stride" is how many slots each element of l will consume.
|
// "stride" is how many slots each element of l will consume.
|
||||||
ZInstAux* InternalBuildVals(const ListExpr* l, int stride = 1);
|
ZInstAux* InternalBuildVals(const ListExpr* l, int stride = 1);
|
||||||
|
|
|
@ -101,7 +101,7 @@ const ZAMStmt ZAMCompiler::CompileAdd(const AggrAddExpr* e) {
|
||||||
return AddStmt1VC(aggr, e1->AsConstExpr());
|
return AddStmt1VC(aggr, e1->AsConstExpr());
|
||||||
}
|
}
|
||||||
|
|
||||||
return AddStmtVO(aggr, BuildVals(indices));
|
return AddStmtVO(aggr, BuildVals(indices).get());
|
||||||
}
|
}
|
||||||
|
|
||||||
const ZAMStmt ZAMCompiler::CompileDel(const AggrDelExpr* e) {
|
const ZAMStmt ZAMCompiler::CompileDel(const AggrDelExpr* e) {
|
||||||
|
@ -128,7 +128,7 @@ const ZAMStmt ZAMCompiler::CompileDel(const AggrDelExpr* e) {
|
||||||
if ( index_list->Tag() != EXPR_LIST )
|
if ( index_list->Tag() != EXPR_LIST )
|
||||||
reporter->InternalError("non-list in \"delete\"");
|
reporter->InternalError("non-list in \"delete\"");
|
||||||
|
|
||||||
auto internal_ind = std::unique_ptr<OpaqueVals>(BuildVals(index_list->AsListExprPtr()));
|
auto internal_ind = BuildVals(index_list->AsListExprPtr());
|
||||||
return DelTableVO(aggr, internal_ind.get());
|
return DelTableVO(aggr, internal_ind.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,9 @@ const ZAMStmt ZAMCompiler::LastInst() { return ZAMStmt(insts1.size() - 1); }
|
||||||
|
|
||||||
const ZAMStmt ZAMCompiler::ErrorStmt() { return ZAMStmt(0); }
|
const ZAMStmt ZAMCompiler::ErrorStmt() { return ZAMStmt(0); }
|
||||||
|
|
||||||
OpaqueVals* ZAMCompiler::BuildVals(const ListExprPtr& l) { return new OpaqueVals(InternalBuildVals(l.get())); }
|
std::unique_ptr<OpaqueVals> ZAMCompiler::BuildVals(const ListExprPtr& l) {
|
||||||
|
return std::make_unique<OpaqueVals>(InternalBuildVals(l.get()));
|
||||||
|
}
|
||||||
|
|
||||||
ZInstAux* ZAMCompiler::InternalBuildVals(const ListExpr* l, int stride) {
|
ZInstAux* ZAMCompiler::InternalBuildVals(const ListExpr* l, int stride) {
|
||||||
auto exprs = l->Exprs();
|
auto exprs = l->Exprs();
|
||||||
|
|
|
@ -2414,7 +2414,7 @@ internal-op Subnet-To-Addr
|
||||||
type VV
|
type VV
|
||||||
eval auto addr_v = make_intrusive<AddrVal>(frame[z.v2].subnet_val->Prefix());
|
eval auto addr_v = make_intrusive<AddrVal>(frame[z.v2].subnet_val->Prefix());
|
||||||
Unref(frame[z.v1].addr_val);
|
Unref(frame[z.v1].addr_val);
|
||||||
frame[z.v1] = ZVal(addr_v);
|
frame[z.v1] = ZVal(std::move(addr_v));
|
||||||
|
|
||||||
internal-op Sub-Bytes
|
internal-op Sub-Bytes
|
||||||
type VVVV
|
type VVVV
|
||||||
|
|
|
@ -78,7 +78,7 @@ const ZAMStmt ZAMCompiler::CompilePrint(const PrintStmt* ps) {
|
||||||
return Print1C(e0->AsConstExpr());
|
return Print1C(e0->AsConstExpr());
|
||||||
}
|
}
|
||||||
|
|
||||||
return PrintO(BuildVals(l));
|
return PrintO(BuildVals(l).get());
|
||||||
}
|
}
|
||||||
|
|
||||||
const ZAMStmt ZAMCompiler::CompileExpr(const ExprStmt* es) {
|
const ZAMStmt ZAMCompiler::CompileExpr(const ExprStmt* es) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue