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

Remove superfluous nullptr checks in Val/RecordVal methods

Browse source
This commit is contained in:
Jon Siwek 2021-01-14 16:07:36 -08:00
parent 16942f3859
commit 0d6394e008
1 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Val.h
View file

@ -215,12 +215,7 @@ UNDERLYING_ACCESSOR_DECL(TypeVal, zeek::Type*, AsType)
{ {
// Since we're converting from "this", make sure the type requested is a pointer. // Since we're converting from "this", make sure the type requested is a pointer.
static_assert(std::is_pointer<T>()); static_assert(std::is_pointer<T>());
return static_cast<T>(this);
auto v = static_cast<T>(this);
if ( ! v )
reporter->InternalError("Failed dynamic_cast between Val types");
return v;
} }
protected: protected:
@ -1264,9 +1259,6 @@ public:
{ {
auto& field_ptr = GetField(field); auto& field_ptr = GetField(field);
auto field_val_ptr = static_cast<T*>(field_ptr.get()); auto field_val_ptr = static_cast<T*>(field_ptr.get());
if ( ! field_val_ptr )
reporter->InternalError("Typecast failed in TableVal::GetFieldAs");
return field_val_ptr->Get(); return field_val_ptr->Get();
} }
@ -1275,9 +1267,6 @@ public:
{ {
auto& field_ptr = GetField(field); auto& field_ptr = GetField(field);
auto field_val_ptr = static_cast<T*>(field_ptr.get()); auto field_val_ptr = static_cast<T*>(field_ptr.get());
if ( ! field_val_ptr )
reporter->InternalError("Typecast failed in TableVal::GetFieldAs");
return field_val_ptr->Get(); return field_val_ptr->Get();
} }