Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp

Browse Source 
Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
This commit is contained in:
Jean-Baptiste Queru
2010-08-17 15:24:11 -07:00
parent 96e24634c6 0b7bd95d69
commit 09f672509b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libmedia/MediaScanner.cpp
View File

@@ -81,13 +81,13 @@ status_t MediaScanner::processDirectory(
} }
static bool fileMatchesExtension(const char* path, const char* extensions) { static bool fileMatchesExtension(const char* path, const char* extensions) {
char* extension = strrchr(path, '.'); const char* extension = strrchr(path, '.');
if (!extension) return false; if (!extension) return false;
++extension; // skip the dot ++extension; // skip the dot
if (extension[0] == 0) return false; if (extension[0] == 0) return false;
while (extensions[0]) { while (extensions[0]) {
char* comma = strchr(extensions, ','); const char* comma = strchr(extensions, ',');
size_t length = (comma ? comma - extensions : strlen(extensions)); size_t length = (comma ? comma - extensions : strlen(extensions));
if (length == strlen(extension) && strncasecmp(extension, extensions, length) == 0) return true; if (length == strlen(extension) && strncasecmp(extension, extensions, length) == 0) return true;
extensions += length; extensions += length;