summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-22 18:08:46 +0200
committerwm4 <wm4@nowhere>2013-08-22 18:20:49 +0200
commit974250b60cc27a178288bd434ba0f90b672a1827 (patch)
tree0bcc3a9da802562e8aad856d995e62790bd16b4f /stream
parenta9cb2dc1b86c0f3e12231abc776009fe0a8bcf0e (diff)
downloadmpv-974250b60cc27a178288bd434ba0f90b672a1827.tar.bz2
mpv-974250b60cc27a178288bd434ba0f90b672a1827.tar.xz
stream_file: uncrustify
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_file.c272
1 files changed, 140 insertions, 132 deletions
diff --git a/stream/stream_file.c b/stream/stream_file.c
index 90615ac51f..cb8d4e2dbf 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -38,173 +38,181 @@ struct priv {
bool close;
};
-static int fill_buffer(stream_t *s, char* buffer, int max_len){
- struct priv *p = s->priv;
- int r = read(p->fd,buffer,max_len);
- return (r <= 0) ? -1 : r;
+static int fill_buffer(stream_t *s, char *buffer, int max_len)
+{
+ struct priv *p = s->priv;
+ int r = read(p->fd, buffer, max_len);
+ return (r <= 0) ? -1 : r;
}
-static int write_buffer(stream_t *s, char* buffer, int len) {
- struct priv *p = s->priv;
- int r;
- int wr = 0;
- while (wr < len) {
- r = write(p->fd,buffer,len);
- if (r <= 0)
- return -1;
- wr += r;
- buffer += r;
- }
- return len;
+static int write_buffer(stream_t *s, char *buffer, int len)
+{
+ struct priv *p = s->priv;
+ int r;
+ int wr = 0;
+ while (wr < len) {
+ r = write(p->fd, buffer, len);
+ if (r <= 0)
+ return -1;
+ wr += r;
+ buffer += r;
+ }
+ return len;
}
-static int seek(stream_t *s,int64_t newpos) {
- struct priv *p = s->priv;
- s->pos = newpos;
- if(lseek(p->fd,s->pos,SEEK_SET)<0) {
- return 0;
- }
- return 1;
+static int seek(stream_t *s, int64_t newpos)
+{
+ struct priv *p = s->priv;
+ s->pos = newpos;
+ if (lseek(p->fd, s->pos, SEEK_SET) < 0)
+ return 0;
+ return 1;
}
-static int seek_forward(stream_t *s,int64_t newpos) {
- if(newpos<s->pos){
- mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n");
- return 0;
- }
- while(s->pos<newpos){
- int len=s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE);
- if(len<=0){ s->buf_pos=s->buf_len=0; break; } // EOF
- s->buf_pos=0;
- s->buf_len=len;
- s->pos+=len;
- }
- return 1;
+static int seek_forward(stream_t *s, int64_t newpos)
+{
+ if (newpos < s->pos) {
+ mp_msg(MSGT_STREAM, MSGL_INFO,
+ "Cannot seek backward in linear streams!\n");
+ return 0;
+ }
+ while (s->pos < newpos) {
+ int len = s->fill_buffer(s, s->buffer, STREAM_BUFFER_SIZE);
+ if (len <= 0) { // EOF
+ s->buf_pos = s->buf_len = 0;
+ break;
+ }
+ s->buf_pos = 0;
+ s->buf_len = len;
+ s->pos += len;
+ }
+ return 1;
}
-static int control(stream_t *s, int cmd, void *arg) {
- struct priv *p = s->priv;
- switch(cmd) {
+static int control(stream_t *s, int cmd, void *arg)
+{
+ struct priv *p = s->priv;
+ switch (cmd) {
case STREAM_CTRL_GET_SIZE: {
- off_t size;
-
- size = lseek(p->fd, 0, SEEK_END);
- lseek(p->fd, s->pos, SEEK_SET);
- if(size != (off_t)-1) {
- *(uint64_t*)arg = size;
- return 1;
- }
+ off_t size;
+
+ size = lseek(p->fd, 0, SEEK_END);
+ lseek(p->fd, s->pos, SEEK_SET);
+ if (size != (off_t)-1) {
+ *(uint64_t *)arg = size;
+ return 1;
+ }
+ }
}
- }
- return STREAM_UNSUPPORTED;
+ return STREAM_UNSUPPORTED;
}
static void s_close(stream_t *s)
{
- struct priv *p = s->priv;
- if (p->close && p->fd >= 0)
- close(p->fd);
+ struct priv *p = s->priv;
+ if (p->close && p->fd >= 0)
+ close(p->fd);
}
static int open_f(stream_t *stream, int mode)
{
- int f;
- mode_t m = 0;
- int64_t len;
- char *filename = stream->path;
- struct priv *priv = talloc_ptrtype(stream, priv);
- *priv = (struct priv) { .fd = -1 };
- stream->priv = priv;
-
- if(mode == STREAM_READ)
- m = O_RDONLY;
- else if(mode == STREAM_WRITE)
- m = O_RDWR|O_CREAT|O_TRUNC;
- else {
- mp_msg(MSGT_OPEN,MSGL_ERR, "[file] Unknown open mode %d\n",mode);
- return STREAM_UNSUPPORTED;
- }
+ int fd;
+ char *filename = stream->path;
+ struct priv *priv = talloc_ptrtype(stream, priv);
+ *priv = (struct priv) {
+ .fd = -1
+ };
+ stream->priv = priv;
+
+ mode_t m = 0;
+ if (mode == STREAM_READ)
+ m = O_RDONLY;
+ else if (mode == STREAM_WRITE)
+ m = O_RDWR | O_CREAT | O_TRUNC;
+ else {
+ mp_msg(MSGT_OPEN, MSGL_ERR, "[file] Unknown open mode %d\n", mode);
+ return STREAM_UNSUPPORTED;
+ }
- // "file://" prefix -> decode URL-style escapes
- if (strlen(stream->url) > strlen(stream->path))
- mp_url_unescape_inplace(stream->path);
+ // "file://" prefix -> decode URL-style escapes
+ if (strlen(stream->url) > strlen(stream->path))
+ mp_url_unescape_inplace(stream->path);
#if HAVE_DOS_PATHS
- // extract '/' from '/x:/path'
- if( filename[ 0 ] == '/' && filename[ 1 ] && filename[ 2 ] == ':' )
- filename++;
+ // extract '/' from '/x:/path'
+ if (filename[0] == '/' && filename[1] && filename[2] == ':')
+ filename++;
#endif
- m |= O_BINARY;
-
- if(!strcmp(filename,"-")){
- if(mode == STREAM_READ) {
- // read from stdin
- mp_tmsg(MSGT_OPEN,MSGL_INFO,"Reading from stdin...\n");
- f=0; // 0=stdin
+ if (!strcmp(filename, "-")) {
+ if (mode == STREAM_READ) {
+ mp_tmsg(MSGT_OPEN, MSGL_INFO, "Reading from stdin...\n");
+ fd = 0;
#if HAVE_SETMODE
- setmode(fileno(stdin),O_BINARY);
+ setmode(fileno(stdin), O_BINARY);
#endif
- } else {
- mp_msg(MSGT_OPEN,MSGL_INFO,"Writing to stdout\n");
- f=1;
+ } else {
+ mp_msg(MSGT_OPEN, MSGL_INFO, "Writing to stdout\n");
+ fd = 1;
#if HAVE_SETMODE
- setmode(fileno(stdout),O_BINARY);
+ setmode(fileno(stdout), O_BINARY);
#endif
- }
- priv->fd = f;
- priv->close = false;
- } else {
- mode_t openmode = S_IRUSR|S_IWUSR;
+ }
+ priv->fd = fd;
+ priv->close = false;
+ } else {
+ mode_t openmode = S_IRUSR | S_IWUSR;
#ifndef __MINGW32__
- openmode |= S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
+ openmode |= S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
#endif
- f=open(filename,m, openmode);
- if(f<0) {
- mp_tmsg(MSGT_OPEN, MSGL_ERR, "Cannot open file '%s': %s\n", filename,
- strerror(errno));
- return STREAM_ERROR;
- }
+ fd = open(filename, m | O_BINARY, openmode);
+ if (fd < 0) {
+ mp_tmsg(MSGT_OPEN, MSGL_ERR, "Cannot open file '%s': %s\n",
+ filename, strerror(errno));
+ return STREAM_ERROR;
+ }
#ifndef __MINGW32__
- struct stat st;
- if (fstat(f, &st) == 0 && S_ISDIR(st.st_mode)) {
- mp_tmsg(MSGT_OPEN,MSGL_ERR,"File is a directory: '%s'\n",filename);
- close(f);
- return STREAM_ERROR;
- }
+ struct stat st;
+ if (fstat(fd, &st) == 0 && S_ISDIR(st.st_mode)) {
+ mp_tmsg(MSGT_OPEN, MSGL_ERR, "File is a directory: '%s'\n",
+ filename);
+ close(fd);
+ return STREAM_ERROR;
+ }
#endif
- priv->fd = f;
- priv->close = true;
- }
+ priv->fd = fd;
+ priv->close = true;
+ }
- len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET);
+ int64_t len = lseek(fd, 0, SEEK_END);
+ lseek(fd, 0, SEEK_SET);
#ifdef __MINGW32__
- // seeks on stdin incorrectly succeed on MinGW
- if(f==0)
- len = -1;
+ // seeks on stdin incorrectly succeed on MinGW
+ if (fd == 0)
+ len = -1;
#endif
- stream->type = STREAMTYPE_FILE;
- if(len == -1 && mode == STREAM_READ) {
- stream->seek = seek_forward;
- stream->flags = MP_STREAM_SEEK_FW;
- } else if(len >= 0) {
- stream->seek = seek;
- stream->end_pos = len;
- }
-
- mp_msg(MSGT_OPEN,MSGL_V,"[file] File size is %"PRId64" bytes\n", (int64_t)len);
-
- stream->fill_buffer = fill_buffer;
- stream->write_buffer = write_buffer;
- stream->control = control;
- stream->read_chunk = 64*1024;
- stream->close = s_close;
-
- return STREAM_OK;
+ stream->type = STREAMTYPE_FILE;
+ if (len == -1 && mode == STREAM_READ) {
+ stream->seek = seek_forward;
+ stream->flags = MP_STREAM_SEEK_FW;
+ } else if (len >= 0) {
+ stream->seek = seek;
+ stream->end_pos = len;
+ }
+
+ mp_msg(MSGT_OPEN, MSGL_V, "[file] File size is %" PRId64 " bytes\n", len);
+
+ stream->fill_buffer = fill_buffer;
+ stream->write_buffer = write_buffer;
+ stream->control = control;
+ stream->read_chunk = 64 * 1024;
+ stream->close = s_close;
+
+ return STREAM_OK;
}
const stream_info_t stream_info_file = {
- "file",
- open_f,
- { "file", "", NULL },
+ "file",
+ open_f,
+ { "file", "", NULL },
};