From 5a23f8c41ee83a0316ae8265841beaf6d97a66d9 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 15 Jul 2010 14:58:25 -0400 Subject: Fixes for simulator build on lucid strchr and strrchr now return const char* instead of char* Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649 Signed-off-by: Mike Lockwood --- media/libmedia/MediaScanner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/libmedia/MediaScanner.cpp') 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; -- cgit v1.1