From aa38ada2d408ae7945c9434aed1da36c001dc3b7 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Sat, 23 Jun 2007 00:47:28 +0000 Subject: simplify stristart() Originally committed as revision 9393 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/cutils.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'libavformat/cutils.c') diff --git a/libavformat/cutils.c b/libavformat/cutils.c index 8580106717..eeeef51464 100644 --- a/libavformat/cutils.c +++ b/libavformat/cutils.c @@ -44,23 +44,15 @@ int strstart(const char *str, const char *pfx, const char **ptr) * prefix. * * @param str input string - * @param val prefix to test + * @param pfx prefix to test * @param ptr updated after the prefix in str in there is a match * @return TRUE if there is a match */ -int stristart(const char *str, const char *val, const char **ptr) +int stristart(const char *str, const char *pfx, const char **ptr) { - const char *p, *q; - p = str; - q = val; - while (*q != '\0') { - if (toupper(*(const unsigned char *)p) != toupper(*(const unsigned char *)q)) - return 0; - p++; - q++; - } - if (ptr) - *ptr = p; - return 1; + while (*pfx && toupper((unsigned)*pfx++) == toupper((unsigned)*str++)); + if (!*pfx && ptr) + *ptr = str; + return !*pfx; } /** -- cgit v1.2.3