Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
aae60936
Commit
aae60936
authored
Apr 02, 2008
by
dionoea
Browse files
Simplify code reading.
parent
4ad218c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/misc/lua/vlc.c
View file @
aae60936
...
...
@@ -405,39 +405,44 @@ static int file_compare( const char **a, const char **b )
int
vlclua_dir_list
(
vlc_object_t
*
p_this
,
const
char
*
luadirname
,
char
**
ppsz_dir_list
)
{
if
(
asprintf
(
&
ppsz_dir_list
[
0
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
int
i
=
0
;
if
(
asprintf
(
&
ppsz_dir_list
[
i
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
p_this
->
p_libvlc
->
psz_datadir
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
i
++
;
# if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
{
const
char
*
psz_vlcpath
=
config_GetDataDir
();
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
if
(
asprintf
(
&
ppsz_dir_list
[
i
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
psz_vlcpath
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
i
++
;
if
(
asprintf
(
&
ppsz_dir_list
[
2
],
"%s"
DIR_SEP
"share"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
if
(
asprintf
(
&
ppsz_dir_list
[
i
],
"%s"
DIR_SEP
"share"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
psz_vlcpath
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
i
++
;
}
# else
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
if
(
asprintf
(
&
ppsz_dir_list
[
i
],
"share"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
# ifdef HAVE_SYS_STAT_H
{
struct
stat
stat_info
;
if
(
(
utf8_stat
(
ppsz_dir_list
[
1
],
&
stat_info
)
==
-
1
)
if
(
(
utf8_stat
(
ppsz_dir_list
[
i
],
&
stat_info
)
==
-
1
)
||
!
S_ISDIR
(
stat_info
.
st_mode
)
)
{
free
(
ppsz_dir_list
[
1
]);
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
free
(
ppsz_dir_list
[
i
]);
if
(
asprintf
(
&
ppsz_dir_list
[
i
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
config_GetDataDir
(),
luadirname
)
<
0
)
return
VLC_ENOMEM
;
}
}
# endif
i
++
;
# endif
return
VLC_SUCCESS
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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