nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

libutil: Make AbstractConfig::getSettings const

Browse source
This commit is contained in:
Sergei Zimmerman 2025-08-11 18:40:35 +03:00
parent 920a878eaa
commit a7fb257ec2
No known key found for this signature in database
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/config-global.cc
View file

@ -15,7 +15,7 @@ bool GlobalConfig::set(const std::string & name, const std::string & value)
return false; return false;
} }
void GlobalConfig::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly) void GlobalConfig::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly) const
{ {
for (auto & config : configRegistrations()) for (auto & config : configRegistrations())
config->getSettings(res, overriddenOnly); config->getSettings(res, overriddenOnly);

2
src/libutil/configuration.cc
View file

@ -85,7 +85,7 @@ void AbstractConfig::reapplyUnknownSettings()
set(s.first, s.second); set(s.first, s.second);
} }
void Config::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly) void Config::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly) const
{ {
for (const auto & opt : _settings) for (const auto & opt : _settings)
if (!opt.second.isAlias && (!overriddenOnly || opt.second.setting->overridden) if (!opt.second.isAlias && (!overriddenOnly || opt.second.setting->overridden)

2
src/libutil/include/nix/util/config-global.hh
View file

@ -17,7 +17,7 @@ struct GlobalConfig : public AbstractConfig
bool set(const std::string & name, const std::string & value) override; bool set(const std::string & name, const std::string & value) override;
void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) override; void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) const override;
void resetOverridden() override; void resetOverridden() override;

4
src/libutil/include/nix/util/configuration.hh
View file

@ -73,7 +73,7 @@ public:
* - res: map to store settings in * - res: map to store settings in
* - overriddenOnly: when set to true only overridden settings will be added to `res` * - overriddenOnly: when set to true only overridden settings will be added to `res`
*/ */
virtual void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) = 0; virtual void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) const = 0;
/** /**
* Parses the configuration in `contents` and applies it * Parses the configuration in `contents` and applies it
@ -160,7 +160,7 @@ public:
void addSetting(AbstractSetting * setting); void addSetting(AbstractSetting * setting);
void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) override; void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) const override;
void resetOverridden() override; void resetOverridden() override;