]> git.sesse.net Git - vlc/commitdiff
Untracked API change utf8 to UTF8
authorNicolas Chauvet <kwizart@gmail.com>
Sat, 10 Apr 2010 13:10:20 +0000 (16:10 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 10 Apr 2010 13:10:30 +0000 (16:10 +0300)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
projects/mozilla/control/npolibvlc.cpp
projects/mozilla/control/nporuntime.cpp
projects/mozilla/vlcplugin.cpp

index 6fb61322e06156f3347fe8d8954ba4c5ce0c18dd..4affd41b81aba91e2a6d5a9ce0bb148d8dd10ca0 100644 (file)
@@ -967,7 +967,7 @@ LibvlcPlaylistNPObject::invoke(int index, const NPVariant *args,
 void LibvlcPlaylistNPObject::parseOptions(const NPString &nps,
                                          int *i_options, char*** ppsz_options)
 {
-    if( nps.utf8length )
+    if( nps.UTF8Length )
     {
         char *s = stringValue(nps);
         char *val = s;
@@ -979,7 +979,7 @@ void LibvlcPlaylistNPObject::parseOptions(const NPString &nps,
             {
                 int nOptions = 0;
 
-                char *end = val + nps.utf8length;
+                char *end = val + nps.UTF8Length;
                 while( val < end )
                 {
                     // skip leading blanks
index b237fbd18497b61856a3e7b384608bfae5ce6629..cced74aa75f015cc3adb47644dadac5b9a73e9d2 100644 (file)
 
 char* RuntimeNPObject::stringValue(const NPString &s)
 {
-    NPUTF8 *val = static_cast<NPUTF8*>(malloc((s.utf8length+1) * sizeof(*val)));
+    NPUTF8 *val = static_cast<NPUTF8*>(malloc((s.UTF8Length+1) * sizeof(*val)));
     if( val )
     {
-        strncpy(val, s.utf8characters, s.utf8length);
-        val[s.utf8length] = '\0';
+        strncpy(val, s.UTF8Characters, s.UTF8Length);
+        val[s.UTF8Length] = '\0';
     }
     return val;
 }
index 41ecab27039f6d82a73602c51797c485a941cac1..caeabdacccb76a9f5650e76c2beebc7719a3d1ad 100644 (file)
@@ -449,8 +449,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
         NPString script;
         NPVariant result;
 
-        script.utf8characters = docLocHref;
-        script.utf8length = sizeof(docLocHref)-1;
+        script.UTF8Characters = docLocHref;
+        script.UTF8Length = sizeof(docLocHref)-1;
 
         if( NPN_Evaluate(p_browser, plugin, &script, &result) )
         {
@@ -458,11 +458,11 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
             {
                 NPString &location = NPVARIANT_TO_STRING(result);
 
-                psz_baseURL = (char *) malloc(location.utf8length+1);
+                psz_baseURL = (char *) malloc(location.UTF8Length+1);
                 if( psz_baseURL )
                 {
-                    strncpy(psz_baseURL, location.utf8characters, location.utf8length);
-                    psz_baseURL[location.utf8length] = '\0';
+                    strncpy(psz_baseURL, location.UTF8Characters, location.UTF8Length);
+                    psz_baseURL[location.UTF8Length] = '\0';
                 }
             }
             NPN_ReleaseVariantValue(&result);