Another clang-format run, changed how parameters are binned
This commit is contained in:
1 parent
8f21a77150
commit
de063e51f0
452 files changed
+5506
-2380
No files matched your search
@@ -453,8 +453,10 @@ int ConfigurationState::load_string(
|
||||
}
|
||||
|
||||
void ConfigurationState::add_metadata_field(
|
||||
proto::FileDescriptorProto *file_dp, proto::DescriptorProto *message_dp,
|
||||
const proto::Descriptor *base_field, int index) {
|
||||
proto::FileDescriptorProto *file_dp,
|
||||
proto::DescriptorProto *message_dp,
|
||||
const proto::Descriptor *base_field,
|
||||
int index) {
|
||||
// Create the metadata message
|
||||
proto::DescriptorProto *meta_message = file_dp->add_message_type();
|
||||
std::string meta_name = base_field->name() + "meta";
|
||||
@@ -775,7 +777,9 @@ inline tuple<string, uint32_t> hostname(const std::string &path) {
|
||||
|
||||
// Loads a single message file or directory
|
||||
bool load_message(
|
||||
std::string url, proto::Message &out_message, IConfigLog &log,
|
||||
std::string url,
|
||||
proto::Message &out_message,
|
||||
IConfigLog &log,
|
||||
ConfigValueQueue &lookup) {
|
||||
ConfigDownloader downloader;
|
||||
|
||||
@@ -801,8 +805,11 @@ bool load_message(
|
||||
}
|
||||
|
||||
int load_directory(
|
||||
std::string url, ConfigDownloader &downloader, proto::Message &out_message,
|
||||
IConfigLog &log, ConfigValueQueue &lookup) {
|
||||
std::string url,
|
||||
ConfigDownloader &downloader,
|
||||
proto::Message &out_message,
|
||||
IConfigLog &log,
|
||||
ConfigValueQueue &lookup) {
|
||||
LogAggregator aggregate_log(log);
|
||||
aggregate_log.info("URL: " + url);
|
||||
|
||||
@@ -872,8 +879,12 @@ int load_directory(
|
||||
}
|
||||
|
||||
ConfigDownloader::Result load_file(
|
||||
std::string path, ConfigDownloader &downloader, proto::Message &out_message,
|
||||
IConfigLog &log, ConfigValueQueue &lookup, bool required) {
|
||||
std::string path,
|
||||
ConfigDownloader &downloader,
|
||||
proto::Message &out_message,
|
||||
IConfigLog &log,
|
||||
ConfigValueQueue &lookup,
|
||||
bool required) {
|
||||
stringstream url_stream;
|
||||
string url = url_from_string(path, required).to_string();
|
||||
ConfigDownloader::Result result = downloader.get(url, url_stream);
|
||||
@@ -891,8 +902,11 @@ ConfigDownloader::Result load_file(
|
||||
}
|
||||
|
||||
void parse_stream(
|
||||
const std::string &file, proto::io::ZeroCopyInputStream &input_stream,
|
||||
proto::Message &out_message, IConfigLog &log, ConfigValueQueue &lookup) {
|
||||
const std::string &file,
|
||||
proto::io::ZeroCopyInputStream &input_stream,
|
||||
proto::Message &out_message,
|
||||
IConfigLog &log,
|
||||
ConfigValueQueue &lookup) {
|
||||
ConfigErrorCollector error_collector(log, file.c_str());
|
||||
bts::google::protobuf::TextFormat::Parser parser;
|
||||
parser.RecordErrorsTo(&error_collector);
|
||||
|
||||
Reference in new issue
Block a user