virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Simplify consume_string() as Michael suggested

Browse Source 
Commited in SoC by Vitor Sessak on 2008-04-06 18:43:02

Originally committed as revision 13293 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-05-24 20:39:12 +00:00
parent 5b2bb2c906
commit 93b7a0f68d
1 changed files with 25 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
libavfilter/graphparser.c
View File

@ -93,69 +93,42 @@ static void consume_whitespace(const char **buf)
*buf += strspn(*buf, " \n\t");
}
/**
* Copy the first size bytes of input string to a null-terminated string,
* removing any control character. Ex: "aaa'bb'c\'c\\" -> "aaabbc'c\"
*/
static void copy_unquoted(char *out, const char *in, int size)
{
int i;
for (i=0; i < size; i++) {
if (in[i] == '\'')
continue;
else if (in[i] == '\\') {
if (i+1 == size) {
*out = 0;
return;
}
i++;
}
*out++ = in[i];
}
*out=0;
}
/**
* Consumes a string from *buf.
* @return a copy of the consumed string, which should be free'd after use
*/
static char *consume_string(const char **buf)
{
const char *start;
char *ret;
int size;
char *out = av_malloc(strlen(*buf));
const char *in = *buf;
char *ret = out;
consume_whitespace(buf);
if (!(**buf))
return av_mallocz(1);
start = *buf;
while(1) {
*buf += strcspn(*buf, " ()=,'\\");
if (**buf == '\\')
*buf+=2;
else
do{
char c = *in++;
switch (c) {
case '\\':
*out++= *in++;
break;
}
if (**buf == '\'') {
const char *p = *buf;
do {
p++;
p = strchr(p, '\'');
} while (p && p[-1] == '\\');
if (p)
*buf = p + 1;
else
*buf += strlen(*buf); // Move the pointer to the null end byte
}
size = *buf - start + 1;
ret = av_malloc(size);
copy_unquoted(ret, start, size-1);
case '\'':
while(*in && *in != '\'')
*out++= *in++;
if(*in) in++;
break;
case 0:
case ')':
case '(':
case '=':
case ',':
*out++= 0;
break;
default:
*out++= c;
}
} while(out[-1]);
*buf = in-1;
return ret;
}