oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

DatabasePlugin: pass config_param reference

Browse Source
This commit is contained in:
Max Kellermann
2013-08-04 13:51:27 +02:00
parent bf6ed643e0
commit 65842cd99e
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/db/ProxyDatabasePlugin.cxx
View File

@@ -48,7 +48,7 @@ class ProxyDatabase : public Database {
Directory *root;
public:
static Database *Create(const struct config_param *param,
static Database *Create(const config_param &param,
GError **error_r);
virtual bool Open(GError **error_r) override;
@@ -73,7 +73,7 @@ public:
GError **error_r) const override;
protected:
bool Configure(const struct config_param *param, GError **error_r);
bool Configure(const config_param &param, GError **error_r);
};
G_GNUC_CONST
@@ -132,7 +132,7 @@ CheckError(struct mpd_connection *connection, GError **error_r)
}
Database *
ProxyDatabase::Create(const struct config_param *param, GError **error_r)
ProxyDatabase::Create(const config_param &param, GError **error_r)
{
ProxyDatabase *db = new ProxyDatabase();
if (!db->Configure(param, error_r)) {
@@ -144,10 +144,10 @@ ProxyDatabase::Create(const struct config_param *param, GError **error_r)
}
bool
ProxyDatabase::Configure(const struct config_param *param, GError **)
ProxyDatabase::Configure(const config_param &param, GError **)
{
host = config_get_block_string(param, "host", "");
port = config_get_block_unsigned(param, "port", 0);
host = param.GetBlockValue("host", "");
port = param.GetBlockValue("port", 0u);
return true;
}

6
src/db/SimpleDatabasePlugin.cxx
View File

@@ -41,7 +41,7 @@ simple_db_quark(void)
}
Database *
SimpleDatabase::Create(const struct config_param *param, GError **error_r)
SimpleDatabase::Create(const config_param &param, GError **error_r)
{
SimpleDatabase *db = new SimpleDatabase();
if (!db->Configure(param, error_r)) {
@@ -53,11 +53,11 @@ SimpleDatabase::Create(const struct config_param *param, GError **error_r)
}
bool
SimpleDatabase::Configure(const struct config_param *param, GError **error_r)
SimpleDatabase::Configure(const config_param &param, GError **error_r)
{
GError *error = NULL;
char *_path = config_dup_block_path(param, "path", &error);
char *_path = param.DupBlockPath("path", &error);
if (_path == NULL) {
if (error != NULL)
g_propagate_error(error_r, error);

4
src/db/SimpleDatabasePlugin.hxx
View File

@@ -60,7 +60,7 @@ public:
return mtime;
}
static Database *Create(const struct config_param *param,
static Database *Create(const config_param &param,
GError **error_r);
virtual bool Open(GError **error_r) override;
@@ -86,7 +86,7 @@ public:
GError **error_r) const override;
protected:
bool Configure(const struct config_param *param, GError **error_r);
bool Configure(const config_param &param, GError **error_r);
gcc_pure
bool Check(GError **error_r) const;