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

addressed minor issues flagged by Coverity

Browse source
This commit is contained in:
Vern Paxson 2024-04-27 19:40:03 -07:00
parent bbcb90741d
commit cf456f943f
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/script_opt/Expr.cc
View file

@ -229,7 +229,7 @@ ExprPtr Expr::ReduceToConditional(Reducer* c, StmtPtr& red_stmt) {
// conditional. // conditional.
StmtPtr red_stmt2; StmtPtr red_stmt2;
new_me = new_me->ReduceToConditional(c, red_stmt2); new_me = new_me->ReduceToConditional(c, red_stmt2);
red_stmt = MergeStmts(red_stmt, red_stmt2); red_stmt = MergeStmts(std::move(red_stmt), std::move(red_stmt2));
return new_me; return new_me;
} }
@ -252,7 +252,7 @@ ExprPtr Expr::ReduceToConditional(Reducer* c, StmtPtr& red_stmt) {
StmtPtr red_stmt2; StmtPtr red_stmt2;
auto res = Reduce(c, red_stmt2); auto res = Reduce(c, red_stmt2);
red_stmt = MergeStmts(red_stmt, red_stmt2); red_stmt = MergeStmts(std::move(red_stmt), std::move(red_stmt2));
return res; return res;
} }
@ -2950,7 +2950,7 @@ bool ScriptOptBuiltinExpr::IsPure() const { return arg1->IsPure() && (! arg2 ||
ExprPtr ScriptOptBuiltinExpr::Duplicate() { ExprPtr ScriptOptBuiltinExpr::Duplicate() {
auto new_me = make_intrusive<ScriptOptBuiltinExpr>(tag, arg1, arg2); auto new_me = make_intrusive<ScriptOptBuiltinExpr>(tag, arg1, arg2);
return with_location_of(new_me, this); return with_location_of(std::move(new_me), this);
} }
bool ScriptOptBuiltinExpr::IsReduced(Reducer* c) const { bool ScriptOptBuiltinExpr::IsReduced(Reducer* c) const {
@ -2980,7 +2980,7 @@ ExprPtr ScriptOptBuiltinExpr::Reduce(Reducer* c, StmtPtr& red_stmt) {
if ( arg2 ) { if ( arg2 ) {
StmtPtr red_stmt2; StmtPtr red_stmt2;
arg2 = arg2->Reduce(c, red_stmt2); arg2 = arg2->Reduce(c, red_stmt2);
red_stmt = MergeStmts(red_stmt, red_stmt2); red_stmt = MergeStmts(std::move(red_stmt), std::move(red_stmt2));
} }
} }

2
src/script_opt/ZAM/BuiltIn.cc
View file

@ -290,7 +290,7 @@ MultiZBI::MultiZBI(std::string name, bool _ret_val_matters, BiFArgsInfo _args_in
: ZAMBuiltIn(std::move(name), _ret_val_matters), args_info(std::move(_args_info)), type_arg(_type_arg) {} : ZAMBuiltIn(std::move(name), _ret_val_matters), args_info(std::move(_args_info)), type_arg(_type_arg) {}
MultiZBI::MultiZBI(std::string name, BiFArgsInfo _args_info, BiFArgsInfo _assign_args_info, int _type_arg) MultiZBI::MultiZBI(std::string name, BiFArgsInfo _args_info, BiFArgsInfo _assign_args_info, int _type_arg)
: MultiZBI(std::move(name), false, _args_info, _type_arg) { : MultiZBI(std::move(name), false, std::move(_args_info), _type_arg) {
assign_args_info = std::move(_assign_args_info); assign_args_info = std::move(_assign_args_info);
have_both = true; have_both = true;
} }

2
src/script_opt/ZAM/Ops.in
View file

@ -1233,7 +1233,7 @@ direct-unary-op Record-Constructor ConstructRecord
macro ConstructRecordPost() macro ConstructRecordPost()
auto& r = frame[z.v1].record_val; auto& r = frame[z.v1].record_val;
Unref(r); Unref(r);
r = new RecordVal(cast_intrusive<RecordType>(z.t), init_vals); r = new RecordVal(cast_intrusive<RecordType>(z.t), std::move(init_vals));
op Construct-Direct-Record op Construct-Direct-Record
type V type V