summaryrefslogtreecommitdiffstats
path: root/stream/stream_netstream.c
diff options
context:
space:
mode:
Diffstat (limited to 'stream/stream_netstream.c')
-rw-r--r--stream/stream_netstream.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index 593e60bd97..0d35462aaa 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -97,7 +97,7 @@ static int lock_fd(int fd) {
lock.l_type = F_WRLCK;
mp_msg(MSGT_STREAM,MSGL_DBG2, "Lock (%d)\n",getpid());
- do {
+ do {
if(fcntl(fd,F_SETLKW,&lock)) {
if(errno == EAGAIN) continue;
mp_msg(MSGT_STREAM,MSGL_ERR, "Failed to get the lock: %s\n",
@@ -161,7 +161,7 @@ static mp_net_stream_packet_t* send_net_stream_cmd(stream_t *s,uint16_t cmd,char
free(pack);
return NULL;
}
-
+
mp_msg(MSGT_STREAM,MSGL_ERR, "Unknown response to %d: %d\n",cmd,pack->cmd);
free(pack);
return NULL;
@@ -191,9 +191,9 @@ static int fill_buffer(stream_t *s, char* buffer, int max_len){
static int seek(stream_t *s,off_t newpos) {
uint64_t pos = le2me_64((uint64_t)newpos);
mp_net_stream_packet_t* pack;
-
+
pack = send_net_stream_cmd(s,NET_STREAM_SEEK,(char*)&pos,8);
- if(!pack) {
+ if(!pack) {
return 0;
}
s->pos = newpos;
@@ -203,15 +203,15 @@ static int seek(stream_t *s,off_t newpos) {
static int net_stream_reset(struct stream *s) {
mp_net_stream_packet_t* pack;
-
- pack = send_net_stream_cmd(s,NET_STREAM_RESET,NULL,0);
+
+ pack = send_net_stream_cmd(s,NET_STREAM_RESET,NULL,0);
if(!pack) {
return 0;
}
free(pack);
return 1;
}
-
+
static int control(struct stream *s,int cmd,void* arg) {
switch(cmd) {
case STREAM_CTRL_RESET:
@@ -222,7 +222,7 @@ static int control(struct stream *s,int cmd,void* arg) {
static void close_s(struct stream *s) {
mp_net_stream_packet_t* pack;
-
+
pack = send_net_stream_cmd(s,NET_STREAM_CLOSE,NULL,0);
if(pack)
free(pack);
@@ -260,14 +260,14 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
if(!pack) {
goto error;
}
-
- if(pack->len != sizeof(mp_net_stream_packet_t) +
+
+ if(pack->len != sizeof(mp_net_stream_packet_t) +
sizeof(mp_net_stream_opened_t)) {
mp_msg(MSGT_OPEN,MSGL_ERR, "Invalid open response packet len (%d bytes)\n",pack->len);
free(pack);
goto error;
}
-
+
opened = (mp_net_stream_opened_t*)pack->data;
net_stream_opened_2_me(opened);