mediacodec: Fix freeze when seeking on pause

[vlc] / compat / strcasestr.c

diff --git a/compat/strcasestr.c b/compat/strcasestr.c
index 45b8830b51835949a1713c074d467d8c2777aa26..a53eda838650f679f7c0a3a47331739db8202591 100644 (file)
--- a/compat/strcasestr.c
+++ b/compat/strcasestr.c
@@ -1,21 +1,21 @@
 /*****************************************************************************
  * strcasestr.c: GNU strcasestr() replacement
  *****************************************************************************
- * Copyright © 2002-2006 the VideoLAN project
+ * Copyright © 2002-2011 VLC authors and VideoLAN
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <assert.h>
 
-int strcasecmp (const char *psz_big, const char *psz_little)
+char *strcasestr (const char *psz_big, const char *psz_little)
 {
     char *p_pos = (char *)psz_big;
 
@@ -34,17 +34,17 @@ int strcasecmp (const char *psz_big, const char *psz_little)
 
     while( *p_pos )
     {
-        if( toupper( *p_pos ) == toupper( *psz_little ) )
+        if( toupper( (unsigned char)*p_pos ) == toupper( (unsigned char)*psz_little ) )
         {
-            char * psz_cur1 = p_pos + 1;
-            char * psz_cur2 = (char *)psz_little + 1;
-            while( *psz_cur1 && *psz_cur2 &&
-                   toupper( *psz_cur1 ) == toupper( *psz_cur2 ) )
+            char *cur1 = p_pos + 1;
+            char *cur2 = (char *)psz_little + 1;
+            while( *cur1 && *cur2
+             && toupper( (unsigned char)*cur1 ) == toupper( (unsigned char)*cur2 ) )
             {
-                psz_cur1++;
-                psz_cur2++;
+                cur1++;
+                cur2++;
             }
-            if( !*psz_cur2 ) return p_pos;
+            if( !*cur2 ) return p_pos;
         }
         p_pos++;
     }