[FFmpeg-cvslog] r9393 - trunk/libavformat/cutils.c

[mru]

Author: mru
Date: Sat Jun 23 02:47:28 2007
New Revision: 9393

Log:
simplify stristart()


Modified:
   trunk/libavformat/cutils.c

Modified: trunk/libavformat/cutils.c
==============================================================================
--- trunk/libavformat/cutils.c	(original)
+++ trunk/libavformat/cutils.c	Sat Jun 23 02:47:28 2007
@@ -44,23 +44,15 @@ int strstart(const char *str, const char
  * 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;
 }
 
 /**