diff options
| author | David Robillard <d@drobilla.net> | 2023-02-03 14:43:19 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2023-02-03 14:43:19 -0500 |
| commit | ad4cec932249445160017cd2cf57917c1c2e2501 (patch) | |
| tree | 0d09dd324f8f3f5411e567bbd1663decce1c6c04 /src/Configuration.cpp | |
| parent | f33d936ce99f9c175ed1171e93b0217258537bb1 (diff) | |
| download | ingen-ad4cec932249445160017cd2cf57917c1c2e2501.tar.gz ingen-ad4cec932249445160017cd2cf57917c1c2e2501.tar.bz2 ingen-ad4cec932249445160017cd2cf57917c1c2e2501.zip | |
Suppress/fix new warnings in clang-tidy 15
Diffstat (limited to 'src/Configuration.cpp')
| -rw-r--r-- | src/Configuration.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Configuration.cpp b/src/Configuration.cpp index aaf421cb..67a91dae 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -146,8 +146,8 @@ Configuration::set_value_from_string(Configuration::Option& option, const std::string& value) { if (option.type == _forge.Int) { - char* endptr = nullptr; - int intval = static_cast<int>(strtol(value.c_str(), &endptr, 10)); + char* endptr = nullptr; + const int intval = static_cast<int>(strtol(value.c_str(), &endptr, 10)); if (endptr && *endptr == '\0') { option.value = _forge.make(intval); } else { @@ -247,8 +247,11 @@ Configuration::load(const FilePath& path) SerdEnv* env = serd_env_new(&node); model.load_file(env, SERD_TURTLE, uri, uri); - Sord::Node nodemm(world, Sord::Node::URI, reinterpret_cast<const char*>(node.buf)); - Sord::Node nil; + const Sord::Node nodemm{world, + Sord::Node::URI, + reinterpret_cast<const char*>(node.buf)}; + + const Sord::Node nil; for (auto i = model.find(nodemm, nil, nil); !i.end(); ++i) { const auto& pred = i.get_predicate(); const auto& obj = i.get_object(); @@ -287,8 +290,8 @@ Configuration::save(URIMap& uri_map, } // Attempt to open file for writing - std::unique_ptr<FILE, decltype(&fclose)> file{fopen(path.c_str(), "w"), - &fclose}; + const std::unique_ptr<FILE, decltype(&fclose)> file{fopen(path.c_str(), "w"), + &fclose}; if (!file) { throw FileError(fmt("Failed to open file %1% (%2%)", path, strerror(errno))); @@ -343,7 +346,7 @@ Configuration::save(URIMap& uri_map, } const std::string key(std::string("ingen:") + o.second.key); - SerdNode pred = serd_node_from_string( + const SerdNode pred = serd_node_from_string( SERD_CURIE, reinterpret_cast<const uint8_t*>(key.c_str())); sratom_write(sratom, &uri_map.urid_unmap(), 0, &base, &pred, value.type(), value.size(), value.get_body()); |