Merge commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad'

* commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad':
  avstring: Mark some character handling functions av_const

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-07 22:32:11 +01:00
commit ed736890d6

View File

@ -203,22 +203,22 @@ char *av_strtok(char *s, const char *delim, char **saveptr);
/** /**
* Locale-independent conversion of ASCII isdigit. * Locale-independent conversion of ASCII isdigit.
*/ */
int av_isdigit(int c); av_const int av_isdigit(int c);
/** /**
* Locale-independent conversion of ASCII isgraph. * Locale-independent conversion of ASCII isgraph.
*/ */
int av_isgraph(int c); av_const int av_isgraph(int c);
/** /**
* Locale-independent conversion of ASCII isspace. * Locale-independent conversion of ASCII isspace.
*/ */
int av_isspace(int c); av_const int av_isspace(int c);
/** /**
* Locale-independent conversion of ASCII characters to uppercase. * Locale-independent conversion of ASCII characters to uppercase.
*/ */
static inline int av_toupper(int c) static inline av_const int av_toupper(int c)
{ {
if (c >= 'a' && c <= 'z') if (c >= 'a' && c <= 'z')
c ^= 0x20; c ^= 0x20;
@ -228,7 +228,7 @@ static inline int av_toupper(int c)
/** /**
* Locale-independent conversion of ASCII characters to lowercase. * Locale-independent conversion of ASCII characters to lowercase.
*/ */
static inline int av_tolower(int c) static inline av_const int av_tolower(int c)
{ {
if (c >= 'A' && c <= 'Z') if (c >= 'A' && c <= 'Z')
c ^= 0x20; c ^= 0x20;
@ -238,7 +238,7 @@ static inline int av_tolower(int c)
/** /**
* Locale-independent conversion of ASCII isxdigit. * Locale-independent conversion of ASCII isxdigit.
*/ */
int av_isxdigit(int c); av_const int av_isxdigit(int c);
/** /**
* Locale-independent case-insensitive compare. * Locale-independent case-insensitive compare.