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
d2b8c6dc
Commit
d2b8c6dc
authored
Jul 23, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zip: remove suspicious peek callback
(The read callback is as suspicious and retained.)
parent
e21858e2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
26 deletions
+0
-26
modules/access/rar/stream.c
modules/access/rar/stream.c
+0
-6
modules/access/zip/zipstream.c
modules/access/zip/zipstream.c
+0
-20
No files found.
modules/access/rar/stream.c
View file @
d2b8c6dc
...
@@ -44,11 +44,6 @@ static int Read(stream_t *s, void *data, unsigned size)
...
@@ -44,11 +44,6 @@ static int Read(stream_t *s, void *data, unsigned size)
return
stream_Read
(
s
->
p_sys
->
payload
,
data
,
size
);
return
stream_Read
(
s
->
p_sys
->
payload
,
data
,
size
);
}
}
static
int
Peek
(
stream_t
*
s
,
const
uint8_t
**
data
,
unsigned
size
)
{
return
stream_Peek
(
s
->
p_sys
->
payload
,
data
,
size
);
}
static
int
Control
(
stream_t
*
s
,
int
query
,
va_list
args
)
static
int
Control
(
stream_t
*
s
,
int
query
,
va_list
args
)
{
{
switch
(
query
)
{
switch
(
query
)
{
...
@@ -145,7 +140,6 @@ int RarStreamOpen(vlc_object_t *object)
...
@@ -145,7 +140,6 @@ int RarStreamOpen(vlc_object_t *object)
}
}
s
->
pf_read
=
Read
;
s
->
pf_read
=
Read
;
s
->
pf_peek
=
Peek
;
s
->
pf_control
=
Control
;
s
->
pf_control
=
Control
;
stream_sys_t
*
sys
=
s
->
p_sys
=
malloc
(
sizeof
(
*
sys
));
stream_sys_t
*
sys
=
s
->
p_sys
=
malloc
(
sizeof
(
*
sys
));
...
...
modules/access/zip/zipstream.c
View file @
d2b8c6dc
...
@@ -54,7 +54,6 @@ vlc_module_end()
...
@@ -54,7 +54,6 @@ vlc_module_end()
* Local prototypes
* Local prototypes
****************************************************************************/
****************************************************************************/
static
int
Read
(
stream_t
*
,
void
*
p_read
,
unsigned
int
i_read
);
static
int
Read
(
stream_t
*
,
void
*
p_read
,
unsigned
int
i_read
);
static
int
Peek
(
stream_t
*
,
const
uint8_t
**
pp_peek
,
unsigned
int
i_peek
);
static
int
Control
(
stream_t
*
,
int
i_query
,
va_list
);
static
int
Control
(
stream_t
*
,
int
i_query
,
va_list
);
typedef
struct
node
node
;
typedef
struct
node
node
;
...
@@ -184,7 +183,6 @@ int StreamOpen( vlc_object_t *p_this )
...
@@ -184,7 +183,6 @@ int StreamOpen( vlc_object_t *p_this )
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
s
->
pf_read
=
Read
;
s
->
pf_read
=
Read
;
s
->
pf_peek
=
Peek
;
s
->
pf_control
=
Control
;
s
->
pf_control
=
Control
;
p_sys
->
fileFunctions
=
(
zlib_filefunc_def
*
)
p_sys
->
fileFunctions
=
(
zlib_filefunc_def
*
)
...
@@ -266,24 +264,6 @@ static int Read( stream_t *s, void *p_read, unsigned int i_read )
...
@@ -266,24 +264,6 @@ static int Read( stream_t *s, void *p_read, unsigned int i_read )
return
i_len
;
return
i_len
;
}
}
/** *************************************************************************
* Peek
****************************************************************************/
static
int
Peek
(
stream_t
*
s
,
const
uint8_t
**
pp_peek
,
unsigned
int
i_peek
)
{
stream_sys_t
*
p_sys
=
s
->
p_sys
;
/* Fill the buffer */
if
(
Fill
(
s
)
)
return
-
1
;
/* Point to the buffer */
int
i_len
=
__MIN
(
i_peek
,
p_sys
->
i_len
-
p_sys
->
i_pos
);
*
pp_peek
=
(
uint8_t
*
)
p_sys
->
psz_xspf
+
p_sys
->
i_pos
;
return
i_len
;
}
/** *************************************************************************
/** *************************************************************************
* Control
* Control
****************************************************************************/
****************************************************************************/
...
...
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