Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
452ceeac
Commit
452ceeac
authored
Jan 16, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
access_samba: don't use deprecated functions.
parent
0ed8e60e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
modules/access/smb.c
modules/access/smb.c
+7
-7
No files found.
modules/access/smb.c
View file @
452ceeac
...
@@ -222,8 +222,8 @@ static int Open( vlc_object_t *p_this )
...
@@ -222,8 +222,8 @@ static int Open( vlc_object_t *p_this )
free
(
psz_uri
);
free
(
psz_uri
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
p_smb
->
debug
=
1
;
smbc_setDebug
(
p_smb
,
1
)
;
p_smb
->
callbacks
.
auth_fn
=
smb_auth
;
smbc_setFunctionAuthData
(
p_smb
,
smb_auth
)
;
if
(
!
smbc_init_context
(
p_smb
)
)
if
(
!
smbc_init_context
(
p_smb
)
)
{
{
...
@@ -233,7 +233,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -233,7 +233,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
if
(
!
(
p_file
=
(
p_smb
->
open
)(
p_smb
,
psz_uri
,
O_RDONLY
,
0
))
)
if
(
!
(
p_file
=
(
smbc_getFunctionOpen
(
p_smb
)
)(
p_smb
,
psz_uri
,
O_RDONLY
,
0
))
)
{
{
msg_Err
(
p_access
,
"open failed for '%s' (%m)"
,
msg_Err
(
p_access
,
"open failed for '%s' (%m)"
,
p_access
->
psz_path
);
p_access
->
psz_path
);
...
@@ -245,7 +245,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -245,7 +245,7 @@ static int Open( vlc_object_t *p_this )
/* Init p_access */
/* Init p_access */
STANDARD_READ_ACCESS_INIT
;
STANDARD_READ_ACCESS_INIT
;
i_ret
=
p_smb
->
fstat
(
p_smb
,
p_file
,
&
filestat
);
i_ret
=
(
smbc_getFunctionFstat
(
p_smb
))
(
p_smb
,
p_file
,
&
filestat
);
if
(
i_ret
)
msg_Err
(
p_access
,
"stat failed (%m)"
);
if
(
i_ret
)
msg_Err
(
p_access
,
"stat failed (%m)"
);
else
p_access
->
info
.
i_size
=
filestat
.
st_size
;
else
p_access
->
info
.
i_size
=
filestat
.
st_size
;
#else
#else
...
@@ -313,7 +313,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -313,7 +313,7 @@ static void Close( vlc_object_t *p_this )
# ifndef HAVE__SMBCCTX_CLOSE_FN
# ifndef HAVE__SMBCCTX_CLOSE_FN
p_sys
->
p_smb
->
close
(
p_sys
->
p_smb
,
p_sys
->
p_file
);
p_sys
->
p_smb
->
close
(
p_sys
->
p_smb
,
p_sys
->
p_file
);
# else
# else
p_sys
->
p_smb
->
close_fn
(
p_sys
->
p_smb
,
p_sys
->
p_file
);
(
smbc_getFunctionClose
(
p_sys
->
p_smb
))
(
p_sys
->
p_smb
,
p_sys
->
p_file
);
# endif
# endif
smbc_free_context
(
p_sys
->
p_smb
,
1
);
smbc_free_context
(
p_sys
->
p_smb
,
1
);
#else
#else
...
@@ -336,7 +336,7 @@ static int Seek( access_t *p_access, int64_t i_pos )
...
@@ -336,7 +336,7 @@ static int Seek( access_t *p_access, int64_t i_pos )
msg_Dbg
(
p_access
,
"seeking to %"
PRId64
,
i_pos
);
msg_Dbg
(
p_access
,
"seeking to %"
PRId64
,
i_pos
);
#ifdef USE_CTX
#ifdef USE_CTX
i_ret
=
p_sys
->
p_smb
->
lseek
(
p_sys
->
p_smb
,
p_sys
->
p_file
,
i_pos
,
SEEK_SET
);
i_ret
=
(
smbc_getFunctionLseek
(
p_sys
->
p_smb
))
(
p_sys
->
p_smb
,
p_sys
->
p_file
,
i_pos
,
SEEK_SET
);
#else
#else
i_ret
=
smbc_lseek
(
p_sys
->
i_smb
,
i_pos
,
SEEK_SET
);
i_ret
=
smbc_lseek
(
p_sys
->
i_smb
,
i_pos
,
SEEK_SET
);
#endif
#endif
...
@@ -363,7 +363,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
...
@@ -363,7 +363,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
if
(
p_access
->
info
.
b_eof
)
return
0
;
if
(
p_access
->
info
.
b_eof
)
return
0
;
#ifdef USE_CTX
#ifdef USE_CTX
i_read
=
p_sys
->
p_smb
->
read
(
p_sys
->
p_smb
,
p_sys
->
p_file
,
p_buffer
,
i_len
);
i_read
=
(
smbc_getFunctionRead
(
p_sys
->
p_smb
))
(
p_sys
->
p_smb
,
p_sys
->
p_file
,
p_buffer
,
i_len
);
#else
#else
i_read
=
smbc_read
(
p_sys
->
i_smb
,
p_buffer
,
i_len
);
i_read
=
smbc_read
(
p_sys
->
i_smb
,
p_buffer
,
i_len
);
#endif
#endif
...
...
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