commit 0b7bd95d69763573b87f95d4e9cab7d7358e9b93
author Rene Bolldorf <xsecute@googlemail.com> Tue Aug 17 23:32:58 2010 +0200
committer Rene Bolldorf <xsecute@googlemail.com> Tue Aug 17 23:45:14 2010 +0200
tree 0eefc323b421507ef33c6cf047785d5bbd0933c7
parent be50507bae350a8dea2a1a865513c31317d4cde9

Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')

Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2

media/libmedia/MediaScanner.cpp

diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp
index 843a8fd..af7f07a 100644
--- a/media/libmedia/MediaScanner.cpp
+++ b/media/libmedia/MediaScanner.cpp
@@ -77,13 +77,13 @@
 }
 
 static bool fileMatchesExtension(const char* path, const char* extensions) {
-    char* extension = strrchr(path, '.');
+    const char* extension = strrchr(path, '.');
     if (!extension) return false;
     ++extension;    // skip the dot
     if (extension[0] == 0) return false;
 
     while (extensions[0]) {
-        char* comma = strchr(extensions, ',');
+        const char* comma = strchr(extensions, ',');
         size_t length = (comma ? comma - extensions : strlen(extensions));
         if (length == strlen(extension) && strncasecmp(extension, extensions, length) == 0) return true;
         extensions += length;

media/libstagefright/HTTPDataSource.cpp

diff --git a/media/libstagefright/HTTPDataSource.cpp b/media/libstagefright/HTTPDataSource.cpp
index f72a6cc..521c3c8 100644
--- a/media/libstagefright/HTTPDataSource.cpp
+++ b/media/libstagefright/HTTPDataSource.cpp
@@ -158,7 +158,7 @@
     string path;
     int port;
 
-    char *slash = strchr(uri + 7, '/');
+    const char *slash = strchr(uri + 7, '/');
     if (slash == NULL) {
         host = uri + 7;
         path = "/";
@@ -167,7 +167,7 @@
         path = slash;
     }
 
-    char *colon = strchr(host.c_str(), ':');
+    const char *colon = strchr(host.c_str(), ':');
     if (colon == NULL) {
         port = 80;
     } else {