Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
afd0fe66
Commit
afd0fe66
authored
Aug 19, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
config/Global: move config_global_check() to Check.cxx
parent
4accc1f1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
87 additions
and
32 deletions
+87
-32
Makefile.am
Makefile.am
+1
-0
Main.cxx
src/Main.cxx
+2
-1
Check.cxx
src/config/Check.cxx
+49
-0
Check.hxx
src/config/Check.hxx
+35
-0
Global.cxx
src/config/Global.cxx
+0
-24
Global.hxx
src/config/Global.hxx
+0
-7
No files found.
Makefile.am
View file @
afd0fe66
...
...
@@ -1016,6 +1016,7 @@ libbasic_a_SOURCES = \
libconf_a_SOURCES
=
\
src/config/Defaults.hxx
\
src/config/Path.cxx src/config/Path.hxx
\
src/config/Check.cxx src/config/Check.hxx
\
src/config/Data.cxx src/config/Data.hxx
\
src/config/Block.cxx src/config/Block.hxx
\
src/config/Param.cxx src/config/Param.hxx
\
...
...
src/Main.cxx
View file @
afd0fe66
...
...
@@ -53,6 +53,7 @@
#include "net/Init.hxx"
#include "lib/icu/Init.hxx"
#include "config/Global.hxx"
#include "config/Check.hxx"
#include "config/Data.hxx"
#include "config/Param.hxx"
#include "config/Path.hxx"
...
...
@@ -643,7 +644,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
}
#endif
config_global_check
(
);
Check
(
raw_config
);
/* enable all audio outputs (if not already done by
playlist_state_restore() */
...
...
src/config/Check.cxx
0 → 100644
View file @
afd0fe66
/*
* Copyright 2003-2018 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#include "Check.hxx"
#include "Data.hxx"
#include "Domain.hxx"
#include "Log.hxx"
static
void
Check
(
const
ConfigBlock
&
block
)
{
if
(
!
block
.
used
)
/* this whole block was not queried at all -
the feature might be disabled at compile time?
Silently ignore it here. */
return
;
for
(
const
auto
&
i
:
block
.
block_params
)
{
if
(
!
i
.
used
)
FormatWarning
(
config_domain
,
"option '%s' on line %i was not recognized"
,
i
.
name
.
c_str
(),
i
.
line
);
}
}
void
Check
(
const
ConfigData
&
config_data
)
noexcept
{
for
(
const
auto
&
list
:
config_data
.
blocks
)
for
(
const
auto
&
block
:
list
)
Check
(
block
);
}
src/config/Check.hxx
0 → 100644
View file @
afd0fe66
/*
* Copyright 2003-2018 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_CONFIG_CHECK_HXX
#define MPD_CONFIG_CHECK_HXX
#include "Option.hxx"
#include "Compiler.h"
struct
ConfigData
;
/**
* Call this function after all configuration has been evaluated. It
* checks for unused parameters, and logs warnings.
*/
void
Check
(
const
ConfigData
&
config_data
)
noexcept
;
#endif
src/config/Global.cxx
View file @
afd0fe66
...
...
@@ -53,30 +53,6 @@ ReadConfigFile(Path path)
Migrate
(
config_data
);
}
static
void
Check
(
const
ConfigBlock
&
block
)
{
if
(
!
block
.
used
)
/* this whole block was not queried at all -
the feature might be disabled at compile time?
Silently ignore it here. */
return
;
for
(
const
auto
&
i
:
block
.
block_params
)
{
if
(
!
i
.
used
)
FormatWarning
(
config_domain
,
"option '%s' on line %i was not recognized"
,
i
.
name
.
c_str
(),
i
.
line
);
}
}
void
config_global_check
(
void
)
{
for
(
const
auto
&
list
:
config_data
.
blocks
)
for
(
const
auto
&
block
:
list
)
Check
(
block
);
}
const
char
*
config_get_string
(
ConfigOption
option
,
const
char
*
default_value
)
noexcept
{
...
...
src/config/Global.hxx
View file @
afd0fe66
...
...
@@ -36,13 +36,6 @@ gcc_const
const
ConfigData
&
GetGlobalConfig
()
noexcept
;
/**
* Call this function after all configuration has been evaluated. It
* checks for unused parameters, and logs warnings.
*/
void
config_global_check
();
void
ReadConfigFile
(
Path
path
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment