# HG changeset patch # User reimar # Date 1257775934 0 # Node ID 2c2733d12823fc4feb7afd71739d4a7340d338f9 # Parent d133a1a83c176e19d419b8a1f1094b63a9fea073 The code for the non-networking case is the same whether networking support was enabled or no, so avoid duplicating it. diff -r d133a1a83c17 -r 2c2733d12823 stream/stream.c --- a/stream/stream.c Mon Nov 09 14:08:35 2009 +0000 +++ b/stream/stream.c Mon Nov 09 14:12:14 2009 +0000 @@ -248,12 +248,9 @@ #ifdef CONFIG_NETWORK if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl); - } else { + } else +#endif len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); - } -#else - len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); -#endif break; case STREAMTYPE_DS: len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE);