Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
e5481369
Commit
e5481369
authored
Mar 18, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc: remove potential logging from within config_LoadCmdLine()
parent
ab68e0b0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
src/misc/variables.c
src/misc/variables.c
+5
-9
No files found.
src/misc/variables.c
View file @
e5481369
...
...
@@ -271,11 +271,10 @@ int var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
assert
(
0
);
}
if
(
i_type
&
VLC_VAR_DOINHERIT
)
if
(
(
i_type
&
VLC_VAR_DOINHERIT
)
&&
var_Inherit
(
p_this
,
psz_name
,
i_type
,
&
p_var
->
val
)
==
0
)
{
if
(
var_Inherit
(
p_this
,
psz_name
,
i_type
,
&
p_var
->
val
)
)
msg_Err
(
p_this
,
"cannot inherit value for %s"
,
psz_name
);
else
if
(
i_type
&
VLC_VAR_HASCHOICE
)
if
(
i_type
&
VLC_VAR_HASCHOICE
)
{
/* We must add the inherited value to our choice list */
p_var
->
i_default
=
0
;
...
...
@@ -1232,14 +1231,11 @@ int var_Inherit( vlc_object_t *p_this, const char *psz_name, int i_type,
case
VLC_VAR_BOOL
:
p_val
->
b_bool
=
config_GetInt
(
p_this
,
psz_name
);
break
;
case
VLC_VAR_ADDRESS
:
return
VLC_ENOOBJ
;
default:
msg_Warn
(
p_this
,
"Could not inherit value for var %s "
"from config. Invalid Type"
,
psz_name
);
assert
(
0
);
case
VLC_VAR_ADDRESS
:
return
VLC_ENOOBJ
;
}
/*msg_Dbg( p_this, "Inherited value for var %s from config", psz_name );*/
return
VLC_SUCCESS
;
}
...
...
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