Skip to content

Commit

Permalink
Settings: Remove unused functions
Browse files Browse the repository at this point in the history 
Make Settings-internal functions private
  • Loading branch information
@SmallJoker @nerzhul
SmallJoker authored and nerzhul committed Oct 1, 2020
1 parent a69bc67 commit 79414aa
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 103 deletions.
87 changes: 8 additions & 79 deletions src/settings.cpp
View file
Expand Up @@ -45,7 +45,13 @@ Settings::~Settings()

Settings & Settings::operator += (const Settings &other)
{
update(other);
if (&other == this)
return *this;

MutexAutoLock lock(m_mutex);
MutexAutoLock lock2(other.m_mutex);

updateNoLock(other);

return *this;
}
Expand Down Expand Up @@ -512,25 +518,6 @@ u32 Settings::getFlagStr(const std::string &name, const FlagDesc *flagdesc,
return flags;
}

// N.B. if getStruct() is used to read a non-POD aggregate type,
// the behavior is undefined.
bool Settings::getStruct(const std::string &name, const std::string &format,
void *out, size_t olen) const
{
std::string valstr;

try {
valstr = get(name);
} catch (SettingNotFoundException &e) {
return false;
}

if (!deSerializeStringToStruct(valstr, format, out, olen))
return false;

return true;
}


bool Settings::getNoiseParams(const std::string &name, NoiseParams &np) const
{
Expand All @@ -546,6 +533,7 @@ bool Settings::getNoiseParamsFromValue(const std::string &name,
if (!getNoEx(name, value))
return false;

// Format: f32,f32,(f32,f32,f32),s32,s32,f32[,f32]
Strfnd f(value);

np.offset = stof(f.next(","));
Expand Down Expand Up @@ -615,28 +603,6 @@ std::vector<std::string> Settings::getNames() const
* Getters that don't throw exceptions *
***************************************/

bool Settings::getEntryNoEx(const std::string &name, SettingsEntry &val) const
{
try {
val = getEntry(name);
return true;
} catch (SettingNotFoundException &e) {
return false;
}
}


bool Settings::getEntryDefaultNoEx(const std::string &name, SettingsEntry &val) const
{
try {
val = getEntryDefault(name);
return true;
} catch (SettingNotFoundException &e) {
return false;
}
}


bool Settings::getGroupNoEx(const std::string &name, Settings *&val) const
{
try {
Expand Down Expand Up @@ -908,17 +874,6 @@ bool Settings::setFlagStr(const std::string &name, u32 flags,
}


bool Settings::setStruct(const std::string &name, const std::string &format,
void *value)
{
std::string structstr;
if (!serializeStructToString(&structstr, format, value))
return false;

return set(name, structstr);
}


bool Settings::setNoiseParams(const std::string &name,
const NoiseParams &np, bool set_default)
{
Expand Down Expand Up @@ -969,32 +924,6 @@ void Settings::clearDefaults()
clearDefaultsNoLock();
}

void Settings::updateValue(const Settings &other, const std::string &name)
{
if (&other == this)
return;

MutexAutoLock lock(m_mutex);

try {
m_settings[name] = other.get(name);
} catch (SettingNotFoundException &e) {
}
}


void Settings::update(const Settings &other)
{
if (&other == this)
return;

MutexAutoLock lock(m_mutex);
MutexAutoLock lock2(other.m_mutex);

updateNoLock(other);
}


SettingsParseEvent Settings::parseConfigObject(const std::string &line,
const std::string &end, std::string &name, std::string &value)
{
Expand Down
49 changes: 25 additions & 24 deletions src/settings.h
View file
Expand Up @@ -113,23 +113,10 @@ class Settings {
bool parseConfigLines(std::istream &is, const std::string &end = "");
void writeLines(std::ostream &os, u32 tab_depth=0) const;

SettingsParseEvent parseConfigObject(const std::string &line,
const std::string &end, std::string &name, std::string &value);
bool updateConfigObject(std::istream &is, std::ostream &os,
const std::string &end, u32 tab_depth=0);

static bool checkNameValid(const std::string &name);
static bool checkValueValid(const std::string &value);
static std::string getMultiline(std::istream &is, size_t *num_lines=NULL);
static void printEntry(std::ostream &os, const std::string &name,
const SettingsEntry &entry, u32 tab_depth=0);

/***********
* Getters *
***********/

const SettingsEntry &getEntry(const std::string &name) const;
const SettingsEntry &getEntryDefault(const std::string &name) const;
Settings *getGroup(const std::string &name) const;
const std::string &get(const std::string &name) const;
const std::string &getDefault(const std::string &name) const;
Expand All @@ -144,10 +131,6 @@ class Settings {
v3f getV3F(const std::string &name) const;
u32 getFlagStr(const std::string &name, const FlagDesc *flagdesc,
u32 *flagmask) const;
// N.B. if getStruct() is used to read a non-POD aggregate type,
// the behavior is undefined.
bool getStruct(const std::string &name, const std::string &format,
void *out, size_t olen) const;
bool getNoiseParams(const std::string &name, NoiseParams &np) const;
bool getNoiseParamsFromValue(const std::string &name, NoiseParams &np) const;
bool getNoiseParamsFromGroup(const std::string &name, NoiseParams &np) const;
Expand All @@ -161,8 +144,6 @@ class Settings {
* Getters that don't throw exceptions *
***************************************/

bool getEntryNoEx(const std::string &name, SettingsEntry &val) const;
bool getEntryDefaultNoEx(const std::string &name, SettingsEntry &val) const;
bool getGroupNoEx(const std::string &name, Settings *&val) const;
bool getNoEx(const std::string &name, std::string &val) const;
bool getDefaultNoEx(const std::string &name, std::string &val) const;
Expand Down Expand Up @@ -206,16 +187,11 @@ class Settings {
const FlagDesc *flagdesc = nullptr, u32 flagmask = U32_MAX);
bool setNoiseParams(const std::string &name, const NoiseParams &np,
bool set_default=false);
// N.B. if setStruct() is used to write a non-POD aggregate type,
// the behavior is undefined.
bool setStruct(const std::string &name, const std::string &format, void *value);

// remove a setting
bool remove(const std::string &name);
void clear();
void clearDefaults();
void updateValue(const Settings &other, const std::string &name);
void update(const Settings &other);

/**************
* Miscellany *
Expand All @@ -232,6 +208,31 @@ class Settings {
SettingsChangedCallback cbf, void *userdata = NULL);

private:
/***********************
* Reading and writing *
***********************/

SettingsParseEvent parseConfigObject(const std::string &line,
const std::string &end, std::string &name, std::string &value);
bool updateConfigObject(std::istream &is, std::ostream &os,
const std::string &end, u32 tab_depth=0);

static bool checkNameValid(const std::string &name);
static bool checkValueValid(const std::string &value);
static std::string getMultiline(std::istream &is, size_t *num_lines=NULL);
static void printEntry(std::ostream &os, const std::string &name,
const SettingsEntry &entry, u32 tab_depth=0);

/***********
* Getters *
***********/

const SettingsEntry &getEntry(const std::string &name) const;
const SettingsEntry &getEntryDefault(const std::string &name) const;

// Allow TestSettings to run sanity checks using private functions.
friend class TestSettings;

void updateNoLock(const Settings &other);
void clearNoLock();
void clearDefaultsNoLock();
Expand Down

0 comments on commit 79414aa

Please sign in to comment.