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
80cf3732
Commit
80cf3732
authored
Mar 24, 2007
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Core: Prefer ANSI-C style comments over C++ comments.
parent
b3704c1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
src/misc/configuration.c
src/misc/configuration.c
+8
-8
No files found.
src/misc/configuration.c
View file @
80cf3732
...
@@ -820,7 +820,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
...
@@ -820,7 +820,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
||
memcmp
(
bom
,
"
\xEF\xBB\xBF
"
,
3
))
||
memcmp
(
bom
,
"
\xEF\xBB\xBF
"
,
3
))
{
{
convert
=
FromLocaleDup
;
convert
=
FromLocaleDup
;
rewind
(
file
);
/
/ no BOM, rewind
rewind
(
file
);
/
* no BOM, rewind */
}
}
module_t
*
module
=
NULL
;
module_t
*
module
=
NULL
;
...
@@ -829,7 +829,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
...
@@ -829,7 +829,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
while
(
fgets
(
line
,
1024
,
file
)
!=
NULL
)
while
(
fgets
(
line
,
1024
,
file
)
!=
NULL
)
{
{
/
/ Ignore comments and empty lines
/
* Ignore comments and empty lines */
switch
(
line
[
0
])
switch
(
line
[
0
])
{
{
case
'#'
:
case
'#'
:
...
@@ -842,10 +842,10 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
...
@@ -842,10 +842,10 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
{
char
*
ptr
=
strchr
(
line
,
']'
);
char
*
ptr
=
strchr
(
line
,
']'
);
if
(
ptr
==
NULL
)
if
(
ptr
==
NULL
)
continue
;
/
/ syntax error;
continue
;
/
* syntax error; */
*
ptr
=
'\0'
;
*
ptr
=
'\0'
;
/
/ New section ( = a given module)
/
* New section ( = a given module) */
strcpy
(
section
,
line
+
1
);
strcpy
(
section
,
line
+
1
);
module
=
NULL
;
module
=
NULL
;
...
@@ -857,7 +857,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
...
@@ -857,7 +857,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
module_t
*
m
=
(
module_t
*
)
p_list
->
p_values
[
i
].
p_object
;
module_t
*
m
=
(
module_t
*
)
p_list
->
p_values
[
i
].
p_object
;
if
((
strcmp
(
section
,
m
->
psz_object_name
)
==
0
)
if
((
strcmp
(
section
,
m
->
psz_object_name
)
==
0
)
&&
(
m
->
i_config_items
>
0
))
/
/ ignore config-less modules
&&
(
m
->
i_config_items
>
0
))
/
* ignore config-less modules */
{
{
module
=
m
;
module
=
m
;
if
(
psz_module_name
!=
NULL
)
if
(
psz_module_name
!=
NULL
)
...
@@ -873,7 +873,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
...
@@ -873,7 +873,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
}
}
if
(
module
==
NULL
)
if
(
module
==
NULL
)
continue
;
/
/ no need to parse if there is no matching module
continue
;
/
* no need to parse if there is no matching module */
char
*
ptr
=
strchr
(
line
,
'\n'
);
char
*
ptr
=
strchr
(
line
,
'\n'
);
if
(
ptr
!=
NULL
)
if
(
ptr
!=
NULL
)
...
@@ -884,7 +884,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
...
@@ -884,7 +884,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
ptr
=
strchr
(
line
,
'='
);
ptr
=
strchr
(
line
,
'='
);
if
(
ptr
==
NULL
)
if
(
ptr
==
NULL
)
continue
;
/
/ syntax error
continue
;
/
* syntax error */
*
ptr
=
'\0'
;
*
ptr
=
'\0'
;
const
char
*
psz_option_value
=
ptr
+
1
;
const
char
*
psz_option_value
=
ptr
+
1
;
...
@@ -1486,7 +1486,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
...
@@ -1486,7 +1486,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
* Parse the command line options
* Parse the command line options
*/
*/
opterr
=
0
;
opterr
=
0
;
optind
=
0
;
/
/ set to 0 to tell GNU getopt to reinitialize
optind
=
0
;
/
* set to 0 to tell GNU getopt to reinitialize */
while
(
(
i_cmd
=
getopt_long
(
*
pi_argc
,
ppsz_argv
,
psz_shortopts
,
while
(
(
i_cmd
=
getopt_long
(
*
pi_argc
,
ppsz_argv
,
psz_shortopts
,
p_longopts
,
&
i_index
)
)
!=
-
1
)
p_longopts
,
&
i_index
)
)
!=
-
1
)
{
{
...
...
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