Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04e3940 authored by Mike Lockwood's avatar Mike Lockwood Committed by Jean-Baptiste Queru
Browse files

Fixes for simulator build on lucid 

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

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
parent c6d813b0

media/libstagefright/NuHTTPDataSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static bool ParseURL( 
        path->setTo(slashPos);

    }



    char *colonPos = strchr(host->string(), ':');

    const char *colonPos = strchr(host->string(), ':');



    if (colonPos != NULL) {

        unsigned long x;

media/libstagefright/httplive/M3UParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) { 
        out->setTo(baseURL);

        out->append(url);

    } else {

        char *slashPos = strrchr(baseURL, '/');

        const char *slashPos = strrchr(baseURL, '/');



        if (slashPos > &baseURL[6]) {

            out->setTo(baseURL, slashPos - baseURL);

media/libstagefright/rtsp/ARTSPConnection.cpp

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ bool ARTSPConnection::ParseURL( 
        path->setTo(slashPos);

    }



    char *colonPos = strchr(host->c_str(), ':');

    const char *colonPos = strchr(host->c_str(), ':');



    if (colonPos != NULL) {

        unsigned long x;

media/libstagefright/rtsp/ASessionDescription.cpp

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void ASessionDescription::getFormatType( 
    AString format;

    getFormat(index, &format);



    char *lastSpacePos = strrchr(format.c_str(), ' ');

    const char *lastSpacePos = strrchr(format.c_str(), ' ');

    CHECK(lastSpacePos != NULL);



    char *end;

media/libstagefright/rtsp/MyHandler.h

+1 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ private: 
            out->setTo(baseURL);

            out->append(url);

        } else {

            char *slashPos = strrchr(baseURL, '/');

            const char *slashPos = strrchr(baseURL, '/');



            if (slashPos > &baseURL[6]) {

                out->setTo(baseURL, slashPos - baseURL);