Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6d4b393 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Parser::ParseConfigFile returns Result<void>" am: d2401873 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2382193



Change-Id: If456e0e899fb6052c3d49aab7fad0c51da76ad1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df200d81 d2401873

init/apex_init_util.cpp

+11 −10
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <glob.h>



#include <map>

#include <vector>



#include <android-base/logging.h>
@@ -66,18 +65,20 @@ static Result<std::vector<std::string>> CollectApexConfigs(const std::string& ap 
}



static Result<void> ParseConfigs(const std::vector<std::string>& configs) {

    Parser parser = CreateApexConfigParser(ActionManager::GetInstance(),

                     ServiceList::GetInstance());

    bool success = true;

    Parser parser =

            CreateApexConfigParser(ActionManager::GetInstance(), ServiceList::GetInstance());

    std::vector<std::string> errors;

    for (const auto& c : configs) {

        success &= parser.ParseConfigFile(c);

        auto result = parser.ParseConfigFile(c);

        // We should handle other config files even when there's an error.

        if (!result.ok()) {

            errors.push_back(result.error().message());

        }



    if (success) {

        return {};

    } else {

        return Error() << "Unable to parse apex configs";

    }

    if (!errors.empty()) {

        return Error() << "Unable to parse apex configs: " << base::Join(errors, "|");

    }

    return {};

}



Result<void> ParseApexConfigs(const std::string& apex_name) {

init/parser.cpp

+11 −7
Original line number Diff line number Diff line
@@ -141,19 +141,19 @@ bool Parser::ParseConfigFileInsecure(const std::string& path) { 
    return true;

}



bool Parser::ParseConfigFile(const std::string& path) {

Result<void> Parser::ParseConfigFile(const std::string& path) {

    LOG(INFO) << "Parsing file " << path << "...";

    android::base::Timer t;

    auto config_contents = ReadFile(path);

    if (!config_contents.ok()) {

        LOG(INFO) << "Unable to read config file '" << path << "': " << config_contents.error();

        return false;

        return Error() << "Unable to read config file '" << path

                       << "': " << config_contents.error();

    }



    ParseData(path, &config_contents.value());



    LOG(VERBOSE) << "(Parsing " << path << " took " << t << ".)";

    return true;

    return {};

}



bool Parser::ParseConfigDir(const std::string& path) {
@@ -176,8 +176,8 @@ bool Parser::ParseConfigDir(const std::string& path) { 
    // Sort first so we load files in a consistent order (bug 31996208)

    std::sort(files.begin(), files.end());

    for (const auto& file : files) {

        if (!ParseConfigFile(file)) {

            LOG(ERROR) << "could not import file '" << file << "'";

        if (auto result = ParseConfigFile(file); !result.ok()) {

            LOG(ERROR) << "could not import file '" << file << "': " << result.error();

        }

    }

    return true;
@@ -187,7 +187,11 @@ bool Parser::ParseConfig(const std::string& path) { 
    if (is_dir(path.c_str())) {

        return ParseConfigDir(path);

    }

    return ParseConfigFile(path);

    auto result = ParseConfigFile(path);

    if (!result.ok()) {

        LOG(INFO) << result.error();

    }

    return result.ok();

}



}  // namespace init

init/parser.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class Parser { 
    Parser();



    bool ParseConfig(const std::string& path);

    bool ParseConfigFile(const std::string& path);

    Result<void> ParseConfigFile(const std::string& path);

    void AddSectionParser(const std::string& name, std::unique_ptr<SectionParser> parser);

    void AddSingleLineParser(const std::string& prefix, LineCallback callback);