diff --git a/src/Serializer.h b/src/Serializer.h index af4878ccf5..543797a7af 100644 --- a/src/Serializer.h +++ b/src/Serializer.h @@ -125,7 +125,7 @@ protected: // This will be increased whenever there is an incompatible change // in the data format. - static const uint32 DATA_FORMAT_VERSION = 24; + static const uint32 DATA_FORMAT_VERSION = 25; ChunkedIO* io; diff --git a/src/Val.cc b/src/Val.cc index aa9c888d49..2d75680182 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -32,7 +32,6 @@ Val::Val(Func* f) val.func_val = f; ::Ref(val.func_val); type = f->FType()->Ref(); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -49,7 +48,6 @@ Val::Val(BroFile* f) assert(f->FType()->Tag() == TYPE_STRING); type = string_file_type->Ref(); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -190,8 +188,6 @@ bool Val::DoSerialize(SerialInfo* info) const if ( ! type->Serialize(info) ) return false; - SERIALIZE_OPTIONAL(attribs); - switch ( type->InternalType() ) { case TYPE_INTERNAL_VOID: info->s->Error("type is void"); @@ -251,9 +247,6 @@ bool Val::DoUnserialize(UnserialInfo* info) if ( ! (type = BroType::Unserialize(info)) ) return false; - UNSERIALIZE_OPTIONAL(attribs, - (RecordVal*) Val::Unserialize(info, TYPE_RECORD)); - switch ( type->InternalType() ) { case TYPE_INTERNAL_VOID: info->s->Error("type is void"); diff --git a/src/Val.h b/src/Val.h index b94cb2d621..58b24a3e5d 100644 --- a/src/Val.h +++ b/src/Val.h @@ -80,7 +80,6 @@ public: { val.int_val = b; type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -90,7 +89,6 @@ public: { val.int_val = bro_int_t(i); type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -100,7 +98,6 @@ public: { val.uint_val = bro_uint_t(u); type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -110,7 +107,6 @@ public: { val.int_val = i; type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -120,7 +116,6 @@ public: { val.uint_val = u; type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -130,7 +125,6 @@ public: { val.double_val = d; type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -145,7 +139,6 @@ public: Val(BroType* t, bool type_type) // Extra arg to differentiate from protected version. { type = new TypeType(t->Ref()); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -155,7 +148,6 @@ public: { val.int_val = 0; type = base_type(TYPE_ERROR); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -364,7 +356,6 @@ protected: { val.string_val = s; type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -376,7 +367,6 @@ protected: Val(TypeTag t) { type = base_type(t); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -385,7 +375,6 @@ protected: Val(BroType* t) { type = t->Ref(); - attribs = 0; #ifdef DEBUG bound_id = 0; #endif @@ -400,7 +389,6 @@ protected: BroValUnion val; BroType* type; - RecordVal* attribs; #ifdef DEBUG // For debugging, we keep the name of the ID to which a Val is bound. @@ -944,7 +932,6 @@ public: { val.int_val = i; type = t; - attribs = 0; } Val* SizeVal() const { return new Val(val.int_val, TYPE_INT); }