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

Fixes for simulator build on lucid

Browse Source 
strchr and strrchr now return const char* instead of char*

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
This commit is contained in:
Mike Lockwood
2010-07-15 14:58:25 -04:00
committed by Jean-Baptiste Queru
parent c6d813b0c5
commit b04e3940d1
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/NuHTTPDataSource.cpp
View File

@@ -42,7 +42,7 @@ static bool ParseURL(
path->setTo(slashPos); path->setTo(slashPos);
} }
char *colonPos = strchr(host->string(), ':'); const char *colonPos = strchr(host->string(), ':');
if (colonPos != NULL) { if (colonPos != NULL) {
unsigned long x; unsigned long x;

2
media/libstagefright/httplive/M3UParser.cpp
View File

@@ -96,7 +96,7 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) {
out->setTo(baseURL); out->setTo(baseURL);
out->append(url); out->append(url);
} else { } else {
char *slashPos = strrchr(baseURL, '/'); const char *slashPos = strrchr(baseURL, '/');
if (slashPos > &baseURL[6]) { if (slashPos > &baseURL[6]) {
out->setTo(baseURL, slashPos - baseURL); out->setTo(baseURL, slashPos - baseURL);

2
media/libstagefright/rtsp/ARTSPConnection.cpp
View File

@@ -133,7 +133,7 @@ bool ARTSPConnection::ParseURL(
path->setTo(slashPos); path->setTo(slashPos);
} }
char *colonPos = strchr(host->c_str(), ':'); const char *colonPos = strchr(host->c_str(), ':');
if (colonPos != NULL) { if (colonPos != NULL) {
unsigned long x; unsigned long x;

2
media/libstagefright/rtsp/ASessionDescription.cpp
View File

@@ -187,7 +187,7 @@ void ASessionDescription::getFormatType(
AString format; AString format;
getFormat(index, &format); getFormat(index, &format);
char *lastSpacePos = strrchr(format.c_str(), ' '); const char *lastSpacePos = strrchr(format.c_str(), ' ');
CHECK(lastSpacePos != NULL); CHECK(lastSpacePos != NULL);
char *end; char *end;

2
media/libstagefright/rtsp/MyHandler.h
View File

@@ -1112,7 +1112,7 @@ private:
out->setTo(baseURL); out->setTo(baseURL);
out->append(url); out->append(url);
} else { } else {
char *slashPos = strrchr(baseURL, '/'); const char *slashPos = strrchr(baseURL, '/');
if (slashPos > &baseURL[6]) { if (slashPos > &baseURL[6]) {
out->setTo(baseURL, slashPos - baseURL); out->setTo(baseURL, slashPos - baseURL);