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

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

Browse Source
This commit is contained in:
Nick Kralevich
2010-05-14 15:30:15 -07:00
committed by Android Git Automerger
parent a8e0f75b7f bfb776acf2
commit cbf26fd3bc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/rs/rsProgram.cpp
View File

@@ -195,7 +195,7 @@ bool Program::loadShader(Context *rsc, uint32_t type)
if (rsc->props.mLogShaders) { if (rsc->props.mLogShaders) {
LOGV("Loading shader type %x, ID %i", type, mShaderID); LOGV("Loading shader type %x, ID %i", type, mShaderID);
LOGV(mShader.string()); LOGV("%s", mShader.string());
} }
if (mShaderID) { if (mShaderID) {

6
libs/rs/rsScriptC.cpp
View File

@@ -159,7 +159,7 @@ void ScriptCState::runCompiler(Context *rsc, ScriptC *s)
ACCchar buf[4096]; ACCchar buf[4096];
ACCsizei len; ACCsizei len;
accGetScriptInfoLog(s->mAccScript, sizeof(buf), &len, buf); accGetScriptInfoLog(s->mAccScript, sizeof(buf), &len, buf);
LOGE(buf); LOGE("%s", buf);
rsc->setError(RS_ERROR_BAD_SCRIPT, "Error compiling user script."); rsc->setError(RS_ERROR_BAD_SCRIPT, "Error compiling user script.");
return; return;
} }
@@ -345,7 +345,7 @@ void ScriptCState::appendTypes(const Context *rsc, String8 *str)
s.append(e->getName()); s.append(e->getName());
s.append("\n\n"); s.append("\n\n");
if (rsc->props.mLogScripts) { if (rsc->props.mLogScripts) {
LOGV(s); LOGV("%s", static_cast<const char*>(s));
} }
str->append(s); str->append(s);
} }
@@ -372,7 +372,7 @@ void ScriptCState::appendTypes(const Context *rsc, String8 *str)
s.append(mSlotNames[ct]); s.append(mSlotNames[ct]);
s.append(";\n"); s.append(";\n");
if (rsc->props.mLogScripts) { if (rsc->props.mLogScripts) {
LOGV(s); LOGV("%s", static_cast<const char*>(s));
} }
str->append(s); str->append(s);
} }