RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify handling of 0-termination in stream_read_line 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30795 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-02-28 12:54:12 +00:00
parent 2c8d69f185
commit d8c02c2dd2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stream/stream.h
View File

@ -268,6 +268,8 @@ inline static int stream_read(stream_t *s,char* mem,int total){
inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max) {
int len;
unsigned char* end,*ptr = mem;
if (max < 1) return NULL;
max--; // reserve one for 0-termination
do {
len = s->buf_len-s->buf_pos;
// try to fill the buffer
@ -276,8 +278,8 @@ inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, in
(len = s->buf_len-s->buf_pos) <= 0)) break;
end = (unsigned char*) memchr((void*)(s->buffer+s->buf_pos),'\n',len);
if(end) len = end - (s->buffer+s->buf_pos) + 1;
if(len > 0 && max > 1) {
int l = len > max-1 ? max-1 : len;
if(len > 0 && max > 0) {
int l = len > max ? max : len;
memcpy(ptr,s->buffer+s->buf_pos,l);
max -= l;
ptr += l;
@ -285,7 +287,7 @@ inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, in
s->buf_pos += len;
} while(!end);
if(s->eof && ptr == mem) return NULL;
if(max > 0) ptr[0] = 0;
ptr[0] = 0;
return mem;
}