summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-10-26 16:44:05 +0200
committerwm4 <wm4@nowhere>2019-10-31 11:05:48 +0100
commita267452b00106993a6b8a34a9c3ca26d15f204aa (patch)
tree4c0c1eab6c0e2377782b1d8a983da5c35f759d8e /stream
parentc6b08d222fd62ac05657a77898e1d749dc3be72f (diff)
downloadmpv-a267452b00106993a6b8a34a9c3ca26d15f204aa.tar.bz2
mpv-a267452b00106993a6b8a34a9c3ca26d15f204aa.tar.xz
stream: move stream_read_line to demux_playlist.c
demux_playlist.c is the only remaining user of this. Not sure if it should stay this way, but for now I'll say yes.
Diffstat (limited to 'stream')
-rw-r--r--stream/stream.c69
-rw-r--r--stream/stream.h2
2 files changed, 0 insertions, 71 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 6dfbfa31a7..fb758f9b1d 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -657,75 +657,6 @@ void free_stream(stream_t *s)
talloc_free(s);
}
-static uint16_t stream_read_word_endian(stream_t *s, bool big_endian)
-{
- unsigned int y = stream_read_char(s);
- y = (y << 8) | stream_read_char(s);
- if (!big_endian)
- y = ((y >> 8) & 0xFF) | (y << 8);
- return y;
-}
-
-// Read characters until the next '\n' (including), or until the buffer in s is
-// exhausted.
-static int read_characters(stream_t *s, uint8_t *dst, int dstsize, int utf16)
-{
- if (utf16 == 1 || utf16 == 2) {
- uint8_t *cur = dst;
- while (1) {
- if ((cur - dst) + 8 >= dstsize) // PUT_UTF8 writes max. 8 bytes
- return -1; // line too long
- uint32_t c;
- uint8_t tmp;
- GET_UTF16(c, stream_read_word_endian(s, utf16 == 2), return -1;)
- if (s->eof)
- break; // legitimate EOF; ignore the case of partial reads
- PUT_UTF8(c, tmp, *cur++ = tmp;)
- if (c == '\n')
- break;
- }
- return cur - dst;
- } else {
- bstr buf = stream_peek_buffer(s);
- uint8_t *end = memchr(buf.start, '\n', buf.len);
- int len = end ? end - buf.start + 1 : buf.len;
- if (len > dstsize)
- return -1; // line too long
- memcpy(dst, buf.start, len);
- stream_skip(s, len);
- return len;
- }
-}
-
-// On error, or if the line is larger than max-1, return NULL and unset s->eof.
-// On EOF, return NULL, and s->eof will be set.
-// Otherwise, return the line (including \n or \r\n at the end of the line).
-// If the return value is non-NULL, it's always the same as mem.
-// utf16: 0: UTF8 or 8 bit legacy, 1: UTF16-LE, 2: UTF16-BE
-unsigned char *stream_read_line(stream_t *s, unsigned char *mem, int max,
- int utf16)
-{
- if (max < 1)
- return NULL;
- int read = 0;
- while (1) {
- // Reserve 1 byte of ptr for terminating \0.
- int l = read_characters(s, &mem[read], max - read - 1, utf16);
- if (l < 0 || memchr(&mem[read], '\0', l)) {
- MP_WARN(s, "error reading line\n");
- s->eof = false;
- return NULL;
- }
- read += l;
- if (l == 0 || (read > 0 && mem[read - 1] == '\n'))
- break;
- }
- mem[read] = '\0';
- if (s->eof && read == 0) // legitimate EOF
- return NULL;
- return mem;
-}
-
static const char *const bom[3] = {"\xEF\xBB\xBF", "\xFF\xFE", "\xFE\xFF"};
// Return utf16 argument for stream_read_line
diff --git a/stream/stream.h b/stream/stream.h
index 71a7011fef..66f151962a 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -161,8 +161,6 @@ inline static int stream_read_char(stream_t *s)
(stream_fill_buffer(s) ? s->buffer[s->buf_pos++] : -256);
}
-unsigned char *stream_read_line(stream_t *s, unsigned char *mem, int max,
- int utf16);
int stream_skip_bom(struct stream *s);
inline static int stream_eof(stream_t *s)