virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge functional code from get_word() and get_word_sep() into a single

Browse Source 
function, since they both do approximately the same thing. At the same time,
remove redir_isspace() altogether since code elsewhere (including
get_word_sep()) uses strchr() for the same purpose. See summary in "[PATCH]
rtsp.c small cleanups" thread.

Originally committed as revision 18122 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-03-21 20:54:47 +00:00
parent 7e726132c2
commit 1ef36a7035
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavformat/rtsp.c
View File

@ -57,11 +57,8 @@ static int rtsp_probe(AVProbeData *p)
return 0; return 0;
} }
static int redir_isspace(int c) #define SPACE_CHARS " \t\r\n"
{ #define redir_isspace(c) strchr(SPACE_CHARS, c)
return c == ' ' || c == '\t' || c == '\n' || c == '\r';
}
static void skip_spaces(const char **pp) static void skip_spaces(const char **pp)
{ {
const char *p; const char *p;
@ -71,15 +68,13 @@ static void skip_spaces(const char **pp)
*pp = p; *pp = p;
} }
static void get_word_sep(char *buf, int buf_size, const char *sep, static void get_word_until_chars(char *buf, int buf_size,
const char **pp) const char *sep, const char **pp)
{ {
const char *p; const char *p;
char *q; char *q;
p = *pp; p = *pp;
if (*p == '/')
p++;
skip_spaces(&p); skip_spaces(&p);
q = buf; q = buf;
while (!strchr(sep, *p) && *p != '\0') { while (!strchr(sep, *p) && *p != '\0') {
@ -92,22 +87,16 @@ static void get_word_sep(char *buf, int buf_size, const char *sep,
*pp = p; *pp = p;
} }
static void get_word_sep(char *buf, int buf_size, const char *sep,
const char **pp)
{
if (**pp == '/') (*pp)++;
get_word_until_chars(buf, buf_size, sep, pp);
}
static void get_word(char *buf, int buf_size, const char **pp) static void get_word(char *buf, int buf_size, const char **pp)
{ {
const char *p; get_word_until_chars(buf, buf_size, SPACE_CHARS, pp);
char *q;
p = *pp;
skip_spaces(&p);
q = buf;
while (!redir_isspace(*p) && *p != '\0') {
if ((q - buf) < buf_size - 1)
*q++ = *p;
p++;
}
if (buf_size > 0)
*q = '\0';
*pp = p;
} }
/* parse the rtpmap description: <codec_name>/<clock_rate>[/<other /* parse the rtpmap description: <codec_name>/<clock_rate>[/<other