Mercurial > mplayer.hg
comparison vobsub.c @ 17527:c4fba504aa37
avoid conflicting types error on cygwin
author | faust3 |
---|---|
date | Thu, 02 Feb 2006 12:01:40 +0000 |
parents | cb14ee6b0944 |
children | 4231482179b6 |
comparison
equal
deleted
inserted
replaced
17526:b92e1224d084 | 17527:c4fba504aa37 |
---|---|
225 #endif | 225 #endif |
226 | 226 |
227 /**********************************************************************/ | 227 /**********************************************************************/ |
228 | 228 |
229 static ssize_t | 229 static ssize_t |
230 getline(char **lineptr, size_t *n, rar_stream_t *stream) | 230 vobsub_getline(char **lineptr, size_t *n, rar_stream_t *stream) |
231 { | 231 { |
232 size_t res = 0; | 232 size_t res = 0; |
233 int c; | 233 int c; |
234 if (*lineptr == NULL) { | 234 if (*lineptr == NULL) { |
235 *lineptr = malloc(4096); | 235 *lineptr = malloc(4096); |
947 ssize_t line_size; | 947 ssize_t line_size; |
948 int res = -1; | 948 int res = -1; |
949 size_t line_reserve = 0; | 949 size_t line_reserve = 0; |
950 char *line = NULL; | 950 char *line = NULL; |
951 do { | 951 do { |
952 line_size = getline(&line, &line_reserve, fd); | 952 line_size = vobsub_getline(&line, &line_reserve, fd); |
953 if (line_size < 0) { | 953 if (line_size < 0) { |
954 break; | 954 break; |
955 } | 955 } |
956 if (*line == 0 || *line == '\r' || *line == '\n' || *line == '#') | 956 if (*line == 0 || *line == '\r' || *line == '\n' || *line == '#') |
957 continue; | 957 continue; |