RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 19:34:43 +00:00
Code Issues Projects Releases Wiki Activity

Replace consume_char() function by *(*buf)++

Browse Source 
Commited in SoC by Vitor Sessak on 2008-03-30 15:46:38

Originally committed as revision 12745 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-04-04 20:09:23 +00:00
parent 4f409baa06
commit 966b8f2dcb
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavfilter/avfiltergraph.c
View File

@ -215,22 +215,6 @@ static void consume_whitespace(const char **buf)
*buf += strspn(*buf, " \n\t"); *buf += strspn(*buf, " \n\t");
} }
/**
* get the next non-whitespace char
*/
static char consume_char(const char **buf)
{
char out;
consume_whitespace(buf);
out = **buf;
if (out)
(*buf)++;
return out;
}
/** /**
* Copy the first size bytes of input string to a null-terminated string, * Copy the first size bytes of input string to a null-terminated string,
* removing any control character. Ex: "aaa'bb'c\'c\\" -> "aaabbc'c\" * removing any control character. Ex: "aaa'bb'c\'c\\" -> "aaabbc'c\"
@ -304,14 +288,14 @@ static char *consume_string(const char **buf)
*/ */
static void parse_link_name(const char **buf, char **name) static void parse_link_name(const char **buf, char **name)
{ {
consume_char(buf); (*buf)++;
*name = consume_string(buf); *name = consume_string(buf);
if (!*name[0]) if (!*name[0])
goto fail; goto fail;
if (consume_char(buf) != ')') if (*(*buf)++ != ')')
goto fail; goto fail;
return; return;
@ -333,7 +317,7 @@ static int parse_filter(const char **buf, AVFilterGraph *graph, int index)
name = consume_string(buf); name = consume_string(buf);
if (**buf == '=') { if (**buf == '=') {
consume_char(buf); (*buf)++;
opts = consume_string(buf); opts = consume_string(buf);
} else { } else {
opts = NULL; opts = NULL;
@ -393,8 +377,8 @@ static int parse_inouts(const char **buf, AVFilterInOut **inout, int firstpad,
*/ */
int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad)
{ {
AVFilterInOut *inout=NULL; AVFilterInOut *inout=NULL;
AVFilterInOut *head=NULL; AVFilterInOut *head=NULL;
int index = 0; int index = 0;
char chr = 0; char chr = 0;
@ -434,7 +418,7 @@ int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilt
} }
pad = parse_inouts(&filters, &inout, 0, LinkTypeOut, index); pad = parse_inouts(&filters, &inout, 0, LinkTypeOut, index);
chr = consume_char(&filters); chr = *filters++;
index++; index++;
} while (chr == ',' || chr == ';'); } while (chr == ',' || chr == ';');