Commit a43416a5 authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

improve ff_get_line to return line length

Originally committed as revision 24400 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7c892951
......@@ -554,18 +554,19 @@ char *get_strz(ByteIOContext *s, char *buf, int maxlen)
return buf;
}
void ff_get_line(ByteIOContext *s, char *buf, int maxlen)
int ff_get_line(ByteIOContext *s, char *buf, int maxlen)
{
int i = 0;
char c;
do {
c = get_byte(s);
if (i < maxlen-1)
if (c && i < maxlen-1)
buf[i++] = c;
} while (c != '\n' && c);
buf[i] = 0;
return i;
}
uint64_t get_be64(ByteIOContext *s)
......
......@@ -167,7 +167,7 @@ int ff_get_v_length(uint64_t val);
*/
void ff_put_v(ByteIOContext *bc, uint64_t val);
void ff_get_line(ByteIOContext *s, char *buf, int maxlen);
int ff_get_line(ByteIOContext *s, char *buf, int maxlen);
#define SPACE_CHARS " \t\r\n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment