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

Reformat Zeek in Spicy style

Browse source 
This largely copies over Spicy's `.clang-format` configuration file. The
one place where we deviate is header include order since Zeek depends on
headers being included in a certain order.
This commit is contained in:
Benjamin Bannier 2023-10-10 21:13:34 +02:00
parent 7b8e7ed72c
commit f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/Tag.cc
View file

@ -4,80 +4,68 @@
#include "zeek/Val.h"
namespace zeek
{
namespace zeek {
const Tag Tag::Error;
Tag::Tag(type_t arg_type, subtype_t arg_subtype) : Tag(nullptr, arg_type, arg_subtype) { }
Tag::Tag(type_t arg_type, subtype_t arg_subtype) : Tag(nullptr, arg_type, arg_subtype) {}
Tag::Tag(const EnumTypePtr& etype, type_t arg_type, subtype_t arg_subtype)
: type(arg_type), subtype(arg_subtype), etype(etype)
{
assert(arg_type > 0);
: type(arg_type), subtype(arg_subtype), etype(etype) {
assert(arg_type > 0);
int64_t i = (int64_t)(type) | ((int64_t)subtype << 31);
int64_t i = (int64_t)(type) | ((int64_t)subtype << 31);
if ( etype )
val = etype->GetEnumVal(i);
}
if ( etype )
val = etype->GetEnumVal(i);
}
Tag::Tag(EnumValPtr arg_val)
{
assert(arg_val);
Tag::Tag(EnumValPtr arg_val) {
assert(arg_val);
val = std::move(arg_val);
val = std::move(arg_val);
int64_t i = val->InternalInt();
type = i & 0xffffffff;
subtype = (i >> 31) & 0xffffffff;
}
int64_t i = val->InternalInt();
type = i & 0xffffffff;
subtype = (i >> 31) & 0xffffffff;
}
Tag::Tag(const Tag& other)
{
type = other.type;
subtype = other.subtype;
val = other.val;
etype = other.etype;
}
Tag::Tag(const Tag& other) {
type = other.type;
subtype = other.subtype;
val = other.val;
etype = other.etype;
}
Tag::Tag()
{
val = nullptr;
etype = nullptr;
}
Tag::Tag() {
val = nullptr;
etype = nullptr;
}
Tag::~Tag() = default;
Tag& Tag::operator=(const Tag& other)
{
if ( this != &other )
{
type = other.type;
subtype = other.subtype;
val = other.val;
etype = other.etype;
}
Tag& Tag::operator=(const Tag& other) {
if ( this != &other ) {
type = other.type;
subtype = other.subtype;
val = other.val;
etype = other.etype;
}
return *this;
}
return *this;
}
Tag& Tag::operator=(Tag&& other) noexcept
{
if ( this != &other )
{
type = other.type;
subtype = other.subtype;
val = std::move(other.val);
etype = std::move(other.etype);
}
Tag& Tag::operator=(Tag&& other) noexcept {
if ( this != &other ) {
type = other.type;
subtype = other.subtype;
val = std::move(other.val);
etype = std::move(other.etype);
}
return *this;
}
return *this;
}
std::string Tag::AsString() const
{
return util::fmt("%" PRIu32 "/%" PRIu32, type, subtype);
}
std::string Tag::AsString() const { return util::fmt("%" PRIu32 "/%" PRIu32, type, subtype); }
} // namespace zeek
} // namespace zeek