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

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

66
src/ScannedFile.cc
View file

@ -6,52 +6,44 @@
#include "zeek/DebugLogger.h"
#include "zeek/Reporter.h"
namespace zeek::detail
{
namespace zeek::detail {
std::list<ScannedFile> files_scanned;
std::vector<SignatureFile> sig_files;
ScannedFile::ScannedFile(int arg_include_level, std::string arg_name, bool arg_skipped,
bool arg_prefixes_checked)
: include_level(arg_include_level), skipped(arg_skipped),
prefixes_checked(arg_prefixes_checked), name(std::move(arg_name))
{
if ( name == canonical_stdin_path )
canonical_path = canonical_stdin_path;
else
{
std::error_code ec;
auto canon = filesystem::canonical(name, ec);
if ( ec )
zeek::reporter->FatalError("failed to get canonical path of %s: %s", name.data(),
ec.message().c_str());
ScannedFile::ScannedFile(int arg_include_level, std::string arg_name, bool arg_skipped, bool arg_prefixes_checked)
: include_level(arg_include_level),
skipped(arg_skipped),
prefixes_checked(arg_prefixes_checked),
name(std::move(arg_name)) {
if ( name == canonical_stdin_path )
canonical_path = canonical_stdin_path;
else {
std::error_code ec;
auto canon = filesystem::canonical(name, ec);
if ( ec )
zeek::reporter->FatalError("failed to get canonical path of %s: %s", name.data(), ec.message().c_str());
canonical_path = canon.string();
}
}
canonical_path = canon.string();
}
}
bool ScannedFile::AlreadyScanned() const
{
auto rval = false;
bool ScannedFile::AlreadyScanned() const {
auto rval = false;
for ( const auto& it : files_scanned )
if ( it.canonical_path == canonical_path )
{
rval = true;
break;
}
for ( const auto& it : files_scanned )
if ( it.canonical_path == canonical_path ) {
rval = true;
break;
}
DBG_LOG(zeek::DBG_SCRIPTS, "AlreadyScanned result (%d) %s", rval, canonical_path.data());
return rval;
}
DBG_LOG(zeek::DBG_SCRIPTS, "AlreadyScanned result (%d) %s", rval, canonical_path.data());
return rval;
}
SignatureFile::SignatureFile(std::string file) : file(std::move(file)) { }
SignatureFile::SignatureFile(std::string file) : file(std::move(file)) {}
SignatureFile::SignatureFile(std::string file, std::string full_path, Location load_location)
: file(std::move(file)), full_path(std::move(full_path)),
load_location(std::move(load_location))
{
}
: file(std::move(file)), full_path(std::move(full_path)), load_location(std::move(load_location)) {}
} // namespace zeek::detail
} // namespace zeek::detail