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
8754d705
Commit
8754d705
authored
Nov 05, 2021
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CommandLine: rename struct options
parent
23d4a2d6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
CommandLine.cxx
src/CommandLine.cxx
+1
-1
CommandLine.hxx
src/CommandLine.hxx
+2
-2
Main.cxx
src/Main.cxx
+5
-4
No files found.
src/CommandLine.cxx
View file @
8754d705
...
...
@@ -334,7 +334,7 @@ bool ConfigLoader::TryFile(const AllocatedPath &base_path, Path path)
}
void
ParseCommandLine
(
int
argc
,
char
**
argv
,
struct
o
ptions
&
options
,
ParseCommandLine
(
int
argc
,
char
**
argv
,
CommandLineO
ptions
&
options
,
ConfigData
&
config
)
{
bool
use_config_file
=
true
;
...
...
src/CommandLine.hxx
View file @
8754d705
...
...
@@ -22,7 +22,7 @@
struct
ConfigData
;
struct
o
ptions
{
struct
CommandLineO
ptions
{
bool
kill
=
false
;
bool
daemon
=
true
;
...
...
@@ -35,7 +35,7 @@ struct options {
};
void
ParseCommandLine
(
int
argc
,
char
**
argv
,
struct
o
ptions
&
options
,
ParseCommandLine
(
int
argc
,
char
**
argv
,
CommandLineO
ptions
&
options
,
ConfigData
&
config
);
#endif
src/Main.cxx
View file @
8754d705
...
...
@@ -142,7 +142,7 @@ struct Config {
#ifdef ENABLE_DAEMON
static
void
glue_daemonize_init
(
const
struct
o
ptions
&
options
,
glue_daemonize_init
(
const
CommandLineO
ptions
&
options
,
const
ConfigData
&
config
)
{
daemonize_init
(
config
.
GetString
(
ConfigOption
::
USER
),
...
...
@@ -361,7 +361,8 @@ Instance::BeginShutdownPartitions() noexcept
}
static
inline
void
MainConfigured
(
const
struct
options
&
options
,
const
ConfigData
&
raw_config
)
MainConfigured
(
const
CommandLineOptions
&
options
,
const
ConfigData
&
raw_config
)
{
#ifdef ENABLE_DAEMON
daemonize_close_stdin
();
...
...
@@ -582,7 +583,7 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
static
void
AndroidMain
()
{
struct
o
ptions
options
;
CommandLineO
ptions
options
;
ConfigData
raw_config
;
const
auto
sdcard
=
Environment
::
getExternalStorageDirectory
();
...
...
@@ -642,7 +643,7 @@ Java_org_musicpd_Bridge_pause(JNIEnv *, jclass)
static
inline
void
MainOrThrow
(
int
argc
,
char
*
argv
[])
{
struct
o
ptions
options
;
CommandLineO
ptions
options
;
ConfigData
raw_config
;
ParseCommandLine
(
argc
,
argv
,
options
,
raw_config
);
...
...
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