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
a483f98c
Commit
a483f98c
authored
Dec 12, 2005
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up and remove unnused internal parameter
parent
0e1777c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
modules/access/directory.c
modules/access/directory.c
+5
-9
No files found.
modules/access/directory.c
View file @
a483f98c
...
@@ -122,7 +122,7 @@ static int Demux( demux_t *p_demux );
...
@@ -122,7 +122,7 @@ static int Demux( demux_t *p_demux );
static
int
DemuxControl
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
);
static
int
DemuxControl
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
);
static
int
ReadDir
(
playlist_t
*
,
c
har
*
psz_name
,
int
i_mode
,
int
*
pi_pos
,
static
int
ReadDir
(
playlist_t
*
,
c
onst
char
*
psz_name
,
int
i_mode
,
playlist_item_t
*
);
playlist_item_t
*
);
/*****************************************************************************
/*****************************************************************************
...
@@ -280,8 +280,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
...
@@ -280,8 +280,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
}
}
p_item
->
input
.
i_type
=
ITEM_TYPE_DIRECTORY
;
p_item
->
input
.
i_type
=
ITEM_TYPE_DIRECTORY
;
if
(
ReadDir
(
p_playlist
,
psz_name
,
i_mode
,
&
i_pos
,
if
(
ReadDir
(
p_playlist
,
psz_name
,
i_mode
,
p_item
)
!=
VLC_SUCCESS
)
p_item
)
!=
VLC_SUCCESS
)
{
{
}
}
end:
end:
...
@@ -385,8 +384,7 @@ static int Filter( const struct dirent *foo )
...
@@ -385,8 +384,7 @@ static int Filter( const struct dirent *foo )
* ReadDir: read a directory and add its content to the list
* ReadDir: read a directory and add its content to the list
*****************************************************************************/
*****************************************************************************/
static
int
ReadDir
(
playlist_t
*
p_playlist
,
static
int
ReadDir
(
playlist_t
*
p_playlist
,
char
*
psz_name
,
int
i_mode
,
int
*
pi_position
,
const
char
*
psz_name
,
int
i_mode
,
playlist_item_t
*
p_parent
)
playlist_item_t
*
p_parent
)
{
{
struct
dirent
**
pp_dir_content
;
struct
dirent
**
pp_dir_content
;
int
i_dir_content
,
i
;
int
i_dir_content
,
i
;
...
@@ -412,7 +410,7 @@ static int ReadDir( playlist_t *p_playlist,
...
@@ -412,7 +410,7 @@ static int ReadDir( playlist_t *p_playlist,
{
{
int
b
;
int
b
;
char
*
tmp
;
char
*
tmp
;
while
(
psz_parser
[
0
]
!=
'\0'
&&
psz_parser
[
0
]
==
' '
)
psz_parser
++
;
while
(
psz_parser
[
0
]
!=
'\0'
&&
psz_parser
[
0
]
==
' '
)
psz_parser
++
;
for
(
b
=
0
;
psz_parser
[
b
]
!=
'\0'
;
b
++
)
for
(
b
=
0
;
psz_parser
[
b
]
!=
'\0'
;
b
++
)
{
{
...
@@ -465,8 +463,6 @@ static int ReadDir( playlist_t *p_playlist,
...
@@ -465,8 +463,6 @@ static int ReadDir( playlist_t *p_playlist,
&&
S_ISDIR
(
stat_data
.
st_mode
)
&&
i_mode
!=
MODE_COLLAPSE
)
&&
S_ISDIR
(
stat_data
.
st_mode
)
&&
i_mode
!=
MODE_COLLAPSE
)
#elif defined( DT_DIR )
#elif defined( DT_DIR )
if
(
(
p_dir_content
->
d_type
&
DT_DIR
)
&&
i_mode
!=
MODE_COLLAPSE
)
if
(
(
p_dir_content
->
d_type
&
DT_DIR
)
&&
i_mode
!=
MODE_COLLAPSE
)
#else
if
(
0
)
#endif
#endif
{
{
if
(
i_mode
==
MODE_NONE
)
if
(
i_mode
==
MODE_NONE
)
...
@@ -494,7 +490,7 @@ static int ReadDir( playlist_t *p_playlist,
...
@@ -494,7 +490,7 @@ static int ReadDir( playlist_t *p_playlist,
p_node
->
input
.
i_type
=
ITEM_TYPE_DIRECTORY
;
p_node
->
input
.
i_type
=
ITEM_TYPE_DIRECTORY
;
if
(
ReadDir
(
p_playlist
,
psz_uri
,
MODE_EXPAND
,
if
(
ReadDir
(
p_playlist
,
psz_uri
,
MODE_EXPAND
,
p
i_position
,
p
_node
)
!=
VLC_SUCCESS
)
p_node
)
!=
VLC_SUCCESS
)
{
{
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
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