Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
caa3a6c5
Commit
caa3a6c5
authored
Feb 14, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LUA: check libdir before datadir
parent
22a57c82
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/misc/lua/vlc.c
modules/misc/lua/vlc.c
+6
-6
No files found.
modules/misc/lua/vlc.c
View file @
caa3a6c5
...
@@ -162,6 +162,12 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
...
@@ -162,6 +162,12 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
i
++
;
i
++
;
free
(
datadir
);
free
(
datadir
);
#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
if
(
likely
(
asprintf
(
&
ppsz_dir_list
[
i
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
config_GetLibDir
(),
luadirname
)
!=
-
1
)
)
i
++
;
#endif
char
*
psz_datapath
=
config_GetDataDir
(
p_this
);
char
*
psz_datapath
=
config_GetDataDir
(
p_this
);
if
(
likely
(
psz_datapath
!=
NULL
)
)
if
(
likely
(
psz_datapath
!=
NULL
)
)
{
{
...
@@ -178,12 +184,6 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
...
@@ -178,12 +184,6 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
free
(
psz_datapath
);
free
(
psz_datapath
);
}
}
#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
if
(
likely
(
asprintf
(
&
ppsz_dir_list
[
i
],
"%s"
DIR_SEP
"lua"
DIR_SEP
"%s"
,
config_GetLibDir
(),
luadirname
)
!=
-
1
)
)
i
++
;
#endif
ppsz_dir_list
[
i
]
=
NULL
;
ppsz_dir_list
[
i
]
=
NULL
;
return
VLC_SUCCESS
;
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