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

Move all Val classes to the zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:55:28 -04:00
parent ec9eff0bd5
commit 64332ca22c
265 changed files with 3154 additions and 3086 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/threading/Manager.cc
View file

@ -164,7 +164,7 @@ bool Manager::SendEvent(MsgThread* thread, const std::string& name, const int nu
for ( int j = 0; j < num_vals; j++)
{
Val* v = Value::ValueToVal(std::string("thread ") + thread->Name(), vals[j], convert_error);
zeek::Val* v = Value::ValueToVal(std::string("thread ") + thread->Name(), vals[j], convert_error);
vl.emplace_back(zeek::AdoptRef{}, v);
if ( v && ! convert_error && ! same_type(type->GetFieldType(j), v->GetType()) )

24
src/threading/SerialTypes.cc
View file

@ -436,7 +436,7 @@ void Value::delete_value_ptr_array(Value** vals, int num_fields)
delete [] vals;
}
Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_error)
zeek::Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_error)
{
if ( have_error )
return nullptr;
@ -456,18 +456,18 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
return val_mgr->Count(val->val.int_val).release();
case zeek::TYPE_DOUBLE:
return new DoubleVal(val->val.double_val);
return new zeek::DoubleVal(val->val.double_val);
case zeek::TYPE_TIME:
return new TimeVal(val->val.double_val);
return new zeek::TimeVal(val->val.double_val);
case zeek::TYPE_INTERVAL:
return new IntervalVal(val->val.double_val);
return new zeek::IntervalVal(val->val.double_val);
case zeek::TYPE_STRING:
{
BroString *s = new BroString((const u_char*)val->val.string_val.data, val->val.string_val.length, true);
return new StringVal(s);
auto* s = new BroString((const u_char*)val->val.string_val.data, val->val.string_val.length, true);
return new zeek::StringVal(s);
}
case zeek::TYPE_PORT:
@ -489,7 +489,7 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
assert(false);
}
AddrVal* addrval = new AddrVal(*addr);
auto* addrval = new zeek::AddrVal(*addr);
delete addr;
return addrval;
}
@ -510,7 +510,7 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
assert(false);
}
SubNetVal* subnetval = new SubNetVal(*addr, val->val.subnet_val.length);
auto* subnetval = new zeek::SubNetVal(*addr, val->val.subnet_val.length);
delete addr;
return subnetval;
}
@ -519,7 +519,7 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
{
RE_Matcher* re = new RE_Matcher(val->val.pattern_text_val);
re->Compile();
return new PatternVal(re);
return new zeek::PatternVal(re);
}
case zeek::TYPE_TABLE:
@ -563,10 +563,10 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
}
auto s = zeek::make_intrusive<zeek::SetType>(std::move(set_index), nullptr);
TableVal* t = new TableVal(std::move(s));
auto* t = new zeek::TableVal(std::move(s));
for ( int j = 0; j < val->val.set_val.size; j++ )
{
Val* assignval = ValueToVal(source, val->val.set_val.vals[j], have_error);
zeek::Val* assignval = ValueToVal(source, val->val.set_val.vals[j], have_error);
t->Assign({zeek::AdoptRef{}, assignval}, nullptr);
}
@ -590,7 +590,7 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
}
auto vt = zeek::make_intrusive<zeek::VectorType>(std::move(type));
auto v = zeek::make_intrusive<VectorVal>(std::move(vt));
auto v = zeek::make_intrusive<zeek::VectorVal>(std::move(vt));
for ( int j = 0; j < val->val.vector_val.size; j++ )
{

2
src/threading/SerialTypes.h
View file

@ -207,7 +207,7 @@ struct Value {
* immediately aborts.
* @return Val representation of the threading::Value. nullptr on error.
*/
static Val* ValueToVal(const std::string& source, const threading::Value* val, bool& have_error);
static zeek::Val* ValueToVal(const std::string& source, const threading::Value* val, bool& have_error);
private:
friend class ::IPAddr;