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

Move a few of the zeek::util methods and variables to zeek::util::detail

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-06 15:45:42 -07:00
parent 5a2ac84eee
commit ddf48d7529
35 changed files with 1221 additions and 1226 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Dict.cc
View file

@ -410,14 +410,14 @@ size_t Dictionary::MemoryAllocation() const
size_t size = padded_sizeof(*this);
if ( table )
{
size += pad_size(Capacity() * sizeof(detail::DictEntry));
size += zeek::util::pad_size(Capacity() * sizeof(detail::DictEntry));
for ( int i = Capacity()-1; i>=0; i-- )
if ( ! table[i].Empty() && table[i].key_size > 8 )
size += pad_size(table[i].key_size);
size += zeek::util::pad_size(table[i].key_size);
}
if ( order )
size += padded_sizeof(std::vector<detail::DictEntry>) + pad_size(sizeof(detail::DictEntry) * order->capacity());
size += padded_sizeof(std::vector<detail::DictEntry>) + zeek::util::pad_size(sizeof(detail::DictEntry) * order->capacity());
return size;
}
@ -497,7 +497,7 @@ void Dictionary::Dump(int level) const
{
if ( table[i].Empty() )
continue;
key_size += pad_size(table[i].key_size);
key_size += zeek::util::pad_size(table[i].key_size);
if ( ! table[i].value )
continue;
}