avutil/avstring: Inline some tiny functions

They're short enough that inlining them actually reduces code size due to
all the overhead associated with making a function call.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Henrik Gramner 2015-09-26 22:27:36 +02:00 committed by Anton Khirnov
parent f56a085593
commit 2c3dbff1d8
2 changed files with 18 additions and 26 deletions

View File

@ -212,28 +212,6 @@ const char *av_dirname(char *path)
return path; return path;
} }
int av_isdigit(int c)
{
return c >= '0' && c <= '9';
}
int av_isgraph(int c)
{
return c > 32 && c < 127;
}
int av_isspace(int c)
{
return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' ||
c == '\v';
}
int av_isxdigit(int c)
{
c = av_tolower(c);
return av_isdigit(c) || (c >= 'a' && c <= 'f');
}
int av_match_name(const char *name, const char *names) int av_match_name(const char *name, const char *names)
{ {
const char *p; const char *p;

View File

@ -154,17 +154,27 @@ char *av_get_token(const char **buf, const char *term);
/** /**
* Locale-independent conversion of ASCII isdigit. * Locale-independent conversion of ASCII isdigit.
*/ */
av_const int av_isdigit(int c); static inline av_const int av_isdigit(int c)
{
return c >= '0' && c <= '9';
}
/** /**
* Locale-independent conversion of ASCII isgraph. * Locale-independent conversion of ASCII isgraph.
*/ */
av_const int av_isgraph(int c); static inline av_const int av_isgraph(int c)
{
return c > 32 && c < 127;
}
/** /**
* Locale-independent conversion of ASCII isspace. * Locale-independent conversion of ASCII isspace.
*/ */
av_const int av_isspace(int c); static inline av_const int av_isspace(int c)
{
return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' ||
c == '\v';
}
/** /**
* Locale-independent conversion of ASCII characters to uppercase. * Locale-independent conversion of ASCII characters to uppercase.
@ -189,7 +199,11 @@ static inline av_const int av_tolower(int c)
/** /**
* Locale-independent conversion of ASCII isxdigit. * Locale-independent conversion of ASCII isxdigit.
*/ */
av_const int av_isxdigit(int c); static inline av_const int av_isxdigit(int c)
{
c = av_tolower(c);
return av_isdigit(c) || (c >= 'a' && c <= 'f');
}
/* /*
* Locale-independent case-insensitive compare. * Locale-independent case-insensitive compare.