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
3a4a430f
Commit
3a4a430f
authored
Jul 17, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fs/Config: use struct ConfigData
parent
36db40b2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
Main.cxx
src/Main.cxx
+1
-1
Config.cxx
src/fs/Config.cxx
+5
-3
Config.hxx
src/fs/Config.hxx
+3
-1
No files found.
src/Main.cxx
View file @
3a4a430f
...
...
@@ -547,7 +547,7 @@ try {
static
int
mpd_main_after_fork
(
const
ConfigData
&
raw_config
,
const
Config
&
config
)
try
{
ConfigureFS
();
ConfigureFS
(
raw_config
);
glue_mapper_init
(
raw_config
);
...
...
src/fs/Config.cxx
View file @
3a4a430f
...
...
@@ -20,15 +20,17 @@
#include "config.h"
#include "Config.hxx"
#include "Charset.hxx"
#include "config/
Global
.hxx"
#include "config/
Data
.hxx"
void
ConfigureFS
()
ConfigureFS
(
const
ConfigData
&
config
)
{
#ifdef HAVE_FS_CHARSET
const
char
*
charset
=
config
_get_s
tring
(
ConfigOption
::
FS_CHARSET
);
const
char
*
charset
=
config
.
GetS
tring
(
ConfigOption
::
FS_CHARSET
);
if
(
charset
!=
nullptr
)
SetFSCharset
(
charset
);
#else
(
void
)
config
;
#endif
}
...
...
src/fs/Config.hxx
View file @
3a4a430f
...
...
@@ -22,13 +22,15 @@
#include "check.h"
struct
ConfigData
;
/**
* Performs global one-time initialization of this class.
*
* Throws std::runtime_error on error.
*/
void
ConfigureFS
();
ConfigureFS
(
const
ConfigData
&
config
);
void
DeinitFS
();
...
...
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