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

Commit bfb776ac authored by Nick Kralevich's avatar Nick Kralevich Committed by Android (Google) Code Review
Browse files

Merge "Get rid of warnings when compiled with -Wformat-security" into kraken

parents 7450c02a ce2cbe4c

libs/rs/rsProgram.cpp

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ bool Program::loadShader(Context *rsc, uint32_t type) 


    if (rsc->props.mLogShaders) {

        LOGV("Loading shader type %x, ID %i", type, mShaderID);

        LOGV(mShader.string());

        LOGV("%s", mShader.string());

    }



    if (mShaderID) {

libs/rs/rsScriptC.cpp

+3 −3
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ void ScriptCState::runCompiler(Context *rsc, ScriptC *s) 
        ACCchar buf[4096];

        ACCsizei len;

        accGetScriptInfoLog(s->mAccScript, sizeof(buf), &len, buf);

        LOGE(buf);

        LOGE("%s", buf);

        rsc->setError(RS_ERROR_BAD_SCRIPT, "Error compiling user script.");

        return;

    }
@@ -345,7 +345,7 @@ void ScriptCState::appendTypes(const Context *rsc, String8 *str) 
            s.append(e->getName());

            s.append("\n\n");

            if (rsc->props.mLogScripts) {

                LOGV(s);

                LOGV("%s", static_cast<const char*>(s));

            }

            str->append(s);

        }
@@ -372,7 +372,7 @@ void ScriptCState::appendTypes(const Context *rsc, String8 *str) 
            s.append(mSlotNames[ct]);

            s.append(";\n");

            if (rsc->props.mLogScripts) {

                LOGV(s);

                LOGV("%s", static_cast<const char*>(s));

            }

            str->append(s);

        }