repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
libsmbclient.c
diff --git
a/ffmpeg/libavformat/libsmbclient.c
b/ffmpeg/libavformat/libsmbclient.c
index 892d2db8a441aa244f7669fde4136a303865f454..8290d75927208b28d9248cb549992e39a5b1628a 100644
(file)
--- a/
ffmpeg/libavformat/libsmbclient.c
+++ b/
ffmpeg/libavformat/libsmbclient.c
@@
-50,12
+50,14
@@
static av_cold int libsmbc_connect(URLContext *h)
libsmbc->ctx = smbc_new_context();
if (!libsmbc->ctx) {
libsmbc->ctx = smbc_new_context();
if (!libsmbc->ctx) {
+ int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Cannot create context: %s.\n", strerror(errno));
av_log(h, AV_LOG_ERROR, "Cannot create context: %s.\n", strerror(errno));
- return
AVERROR(errno)
;
+ return
ret
;
}
if (!smbc_init_context(libsmbc->ctx)) {
}
if (!smbc_init_context(libsmbc->ctx)) {
+ int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Cannot initialize context: %s.\n", strerror(errno));
av_log(h, AV_LOG_ERROR, "Cannot initialize context: %s.\n", strerror(errno));
- return
AVERROR(errno)
;
+ return
ret
;
}
smbc_set_context(libsmbc->ctx);
}
smbc_set_context(libsmbc->ctx);
@@
-68,8
+70,9
@@
static av_cold int libsmbc_connect(URLContext *h)
smbc_setWorkgroup(libsmbc->ctx, libsmbc->workgroup);
if (smbc_init(NULL, 0) < 0) {
smbc_setWorkgroup(libsmbc->ctx, libsmbc->workgroup);
if (smbc_init(NULL, 0) < 0) {
+ int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Initialization failed: %s\n", strerror(errno));
av_log(h, AV_LOG_ERROR, "Initialization failed: %s\n", strerror(errno));
- return
AVERROR(errno)
;
+ return
ret
;
}
return 0;
}
}
return 0;
}
@@
-157,8
+160,9
@@
static int libsmbc_read(URLContext *h, unsigned char *buf, int size)
int bytes_read;
if ((bytes_read = smbc_read(libsmbc->fd, buf, size)) < 0) {
int bytes_read;
if ((bytes_read = smbc_read(libsmbc->fd, buf, size)) < 0) {
+ int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Read error: %s\n", strerror(errno));
av_log(h, AV_LOG_ERROR, "Read error: %s\n", strerror(errno));
- return
AVERROR(errno)
;
+ return
ret
;
}
return bytes_read;
}
return bytes_read;
@@
-170,8
+174,9
@@
static int libsmbc_write(URLContext *h, const unsigned char *buf, int size)
int bytes_written;
if ((bytes_written = smbc_write(libsmbc->fd, buf, size)) < 0) {
int bytes_written;
if ((bytes_written = smbc_write(libsmbc->fd, buf, size)) < 0) {
+ int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Write error: %s\n", strerror(errno));
av_log(h, AV_LOG_ERROR, "Write error: %s\n", strerror(errno));
- return
AVERROR(errno)
;
+ return
ret
;
}
return bytes_written;
}
return bytes_written;