Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 07:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove unused Val::attribs member.

Browse source
This commit is contained in:
Jon Siwek 2014-04-23 10:44:47 -05:00
parent b9e956176e
commit 782615e9dd
3 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Serializer.h
View file

@ -125,7 +125,7 @@ protected:
// This will be increased whenever there is an incompatible change // This will be increased whenever there is an incompatible change
// in the data format. // in the data format.
static const uint32 DATA_FORMAT_VERSION = 24; static const uint32 DATA_FORMAT_VERSION = 25;
ChunkedIO* io; ChunkedIO* io;

7
src/Val.cc
View file

@ -32,7 +32,6 @@ Val::Val(Func* f)
val.func_val = f; val.func_val = f;
::Ref(val.func_val); ::Ref(val.func_val);
type = f->FType()->Ref(); type = f->FType()->Ref();
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -49,7 +48,6 @@ Val::Val(BroFile* f)
assert(f->FType()->Tag() == TYPE_STRING); assert(f->FType()->Tag() == TYPE_STRING);
type = string_file_type->Ref(); type = string_file_type->Ref();
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -190,8 +188,6 @@ bool Val::DoSerialize(SerialInfo* info) const
if ( ! type->Serialize(info) ) if ( ! type->Serialize(info) )
return false; return false;
SERIALIZE_OPTIONAL(attribs);
switch ( type->InternalType() ) { switch ( type->InternalType() ) {
case TYPE_INTERNAL_VOID: case TYPE_INTERNAL_VOID:
info->s->Error("type is void"); info->s->Error("type is void");
@ -251,9 +247,6 @@ bool Val::DoUnserialize(UnserialInfo* info)
if ( ! (type = BroType::Unserialize(info)) ) if ( ! (type = BroType::Unserialize(info)) )
return false; return false;
UNSERIALIZE_OPTIONAL(attribs,
(RecordVal*) Val::Unserialize(info, TYPE_RECORD));
switch ( type->InternalType() ) { switch ( type->InternalType() ) {
case TYPE_INTERNAL_VOID: case TYPE_INTERNAL_VOID:
info->s->Error("type is void"); info->s->Error("type is void");

13
src/Val.h
View file

@ -80,7 +80,6 @@ public:
{ {
val.int_val = b; val.int_val = b;
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -90,7 +89,6 @@ public:
{ {
val.int_val = bro_int_t(i); val.int_val = bro_int_t(i);
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -100,7 +98,6 @@ public:
{ {
val.uint_val = bro_uint_t(u); val.uint_val = bro_uint_t(u);
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -110,7 +107,6 @@ public:
{ {
val.int_val = i; val.int_val = i;
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -120,7 +116,6 @@ public:
{ {
val.uint_val = u; val.uint_val = u;
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -130,7 +125,6 @@ public:
{ {
val.double_val = d; val.double_val = d;
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -145,7 +139,6 @@ public:
Val(BroType* t, bool type_type) // Extra arg to differentiate from protected version. Val(BroType* t, bool type_type) // Extra arg to differentiate from protected version.
{ {
type = new TypeType(t->Ref()); type = new TypeType(t->Ref());
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -155,7 +148,6 @@ public:
{ {
val.int_val = 0; val.int_val = 0;
type = base_type(TYPE_ERROR); type = base_type(TYPE_ERROR);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -364,7 +356,6 @@ protected:
{ {
val.string_val = s; val.string_val = s;
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -376,7 +367,6 @@ protected:
Val(TypeTag t) Val(TypeTag t)
{ {
type = base_type(t); type = base_type(t);
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -385,7 +375,6 @@ protected:
Val(BroType* t) Val(BroType* t)
{ {
type = t->Ref(); type = t->Ref();
attribs = 0;
#ifdef DEBUG #ifdef DEBUG
bound_id = 0; bound_id = 0;
#endif #endif
@ -400,7 +389,6 @@ protected:
BroValUnion val; BroValUnion val;
BroType* type; BroType* type;
RecordVal* attribs;
#ifdef DEBUG #ifdef DEBUG
// For debugging, we keep the name of the ID to which a Val is bound. // For debugging, we keep the name of the ID to which a Val is bound.
@ -944,7 +932,6 @@ public:
{ {
val.int_val = i; val.int_val = i;
type = t; type = t;
attribs = 0;
} }
Val* SizeVal() const { return new Val(val.int_val, TYPE_INT); } Val* SizeVal() const { return new Val(val.int_val, TYPE_INT); }