summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaScanner.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-07-15 14:58:25 -0400
committerMike Lockwood <lockwood@android.com>2010-07-15 15:02:52 -0400
commit5a23f8c41ee83a0316ae8265841beaf6d97a66d9 (patch)
treee1b412b2a210d6a44326f01e6f865db68f16ef5b /media/libmedia/MediaScanner.cpp
parentce38d0c2e5bab454d9cb9f9ab6e99483b4754c87 (diff)
downloadframeworks_base-5a23f8c41ee83a0316ae8265841beaf6d97a66d9.zip
frameworks_base-5a23f8c41ee83a0316ae8265841beaf6d97a66d9.tar.gz
frameworks_base-5a23f8c41ee83a0316ae8265841beaf6d97a66d9.tar.bz2
Fixes for simulator build on lucid
strchr and strrchr now return const char* instead of char* Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/libmedia/MediaScanner.cpp')
-rw-r--r--media/libmedia/MediaScanner.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp
index 24426ff..ba98f04 100644
--- a/media/libmedia/MediaScanner.cpp
+++ b/media/libmedia/MediaScanner.cpp
@@ -81,13 +81,13 @@ status_t MediaScanner::processDirectory(
}
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;