RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-31 15:59:34 +00:00
Code Issues Releases Wiki Activity

stream_file: remove an indirection

Browse Source 
Remove the "fd" local variable, and always use "p->fd" directly.
This commit is contained in:
wm4 2015-07-10 12:47:53 +02:00
parent 4c04f74a50
commit 01ce203ed7
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
stream/stream_file.c
View File

@ -229,7 +229,6 @@ static bool check_stream_network(int fd)
static int open_f(stream_t *stream) static int open_f(stream_t *stream)
{ {
int fd;
struct priv *p = talloc_ptrtype(stream, p); struct priv *p = talloc_ptrtype(stream, p);
*p = (struct priv) { *p = (struct priv) {
.fd = -1 .fd = -1
@ -249,25 +248,23 @@ static int open_f(stream_t *stream)
if (strncmp(stream->url, "fd://", 5) == 0) { if (strncmp(stream->url, "fd://", 5) == 0) {
char *end = NULL; char *end = NULL;
fd = strtol(stream->url + 5, &end, 0); p->fd = strtol(stream->url + 5, &end, 0);
if (!end || end == stream->url + 5 || end[0]) { if (!end || end == stream->url + 5 || end[0]) {
MP_ERR(stream, "Invalid FD: %s\n", stream->url); MP_ERR(stream, "Invalid FD: %s\n", stream->url);
return STREAM_ERROR; return STREAM_ERROR;
} }
p->fd = fd;
p->close = false; p->close = false;
} else if (!strcmp(filename, "-")) { } else if (!strcmp(filename, "-")) {
if (!write) { if (!write) {
MP_INFO(stream, "Reading from stdin...\n"); MP_INFO(stream, "Reading from stdin...\n");
fd = 0; p->fd = 0;
} else { } else {
MP_INFO(stream, "Writing to stdout...\n"); MP_INFO(stream, "Writing to stdout...\n");
fd = 1; p->fd = 1;
} }
#ifdef __MINGW32__ #ifdef __MINGW32__
setmode(fd, O_BINARY); setmode(p->fd, O_BINARY);
#endif #endif
p->fd = fd;
p->close = false; p->close = false;
} else { } else {
mode_t openmode = S_IRUSR | S_IWUSR; mode_t openmode = S_IRUSR | S_IWUSR;
@ -276,14 +273,14 @@ static int open_f(stream_t *stream)
if (!write) if (!write)
m |= O_NONBLOCK; m |= O_NONBLOCK;
#endif #endif
fd = open(filename, m | O_BINARY, openmode); p->fd = open(filename, m | O_BINARY, openmode);
if (fd < 0) { if (p->fd < 0) {
MP_ERR(stream, "Cannot open file '%s': %s\n", MP_ERR(stream, "Cannot open file '%s': %s\n",
filename, mp_strerror(errno)); filename, mp_strerror(errno));
return STREAM_ERROR; return STREAM_ERROR;
} }
struct stat st; struct stat st;
if (fstat(fd, &st) == 0) { if (fstat(p->fd, &st) == 0) {
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
stream->type = STREAMTYPE_DIR; stream->type = STREAMTYPE_DIR;
stream->allow_caching = false; stream->allow_caching = false;
@ -293,17 +290,16 @@ static int open_f(stream_t *stream)
if (S_ISREG(st.st_mode)) { if (S_ISREG(st.st_mode)) {
p->regular = true; p->regular = true;
// O_NONBLOCK has weird semantics on file locks; remove it. // O_NONBLOCK has weird semantics on file locks; remove it.
int val = fcntl(fd, F_GETFL) & ~(unsigned)O_NONBLOCK; int val = fcntl(p->fd, F_GETFL) & ~(unsigned)O_NONBLOCK;
fcntl(fd, F_SETFL, val); fcntl(p->fd, F_SETFL, val);
} }
#endif #endif
} }
p->fd = fd;
p->close = true; p->close = true;
} }
off_t len = lseek(fd, 0, SEEK_END); off_t len = lseek(p->fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET); lseek(p->fd, 0, SEEK_SET);
if (len != (off_t)-1) { if (len != (off_t)-1) {
stream->seek = seek; stream->seek = seek;
stream->seekable = true; stream->seekable = true;
@ -316,7 +312,7 @@ static int open_f(stream_t *stream)
stream->read_chunk = 64 * 1024; stream->read_chunk = 64 * 1024;
stream->close = s_close; stream->close = s_close;
if (check_stream_network(fd)) if (check_stream_network(p->fd))
stream->streaming = true; stream->streaming = true;
return STREAM_OK; return STREAM_OK;