diff options
| author | Nick Kralevich <nnk@google.com> | 2010-05-14 15:28:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-14 15:28:09 -0700 |
| commit | bfb776acf20652801b88a53f362cb4e0ac517515 (patch) | |
| tree | f48b9d737940bbef0a0419ff8d32ae94e3fa80eb | |
| parent | 7450c02a35d7c1f8580f906d6f1c1a11bc5c4fd0 (diff) | |
| parent | ce2cbe4c9605bfc4843968ff6e9746d23643f031 (diff) | |
| download | frameworks_base-bfb776acf20652801b88a53f362cb4e0ac517515.zip frameworks_base-bfb776acf20652801b88a53f362cb4e0ac517515.tar.gz frameworks_base-bfb776acf20652801b88a53f362cb4e0ac517515.tar.bz2 | |
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
| -rw-r--r-- | libs/rs/rsProgram.cpp | 2 | ||||
| -rw-r--r-- | libs/rs/rsScriptC.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/rs/rsProgram.cpp b/libs/rs/rsProgram.cpp index 478a6dc..70e2868 100644 --- a/libs/rs/rsProgram.cpp +++ b/libs/rs/rsProgram.cpp @@ -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) { diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp index 1f23773..f4d2451 100644 --- a/libs/rs/rsScriptC.cpp +++ b/libs/rs/rsScriptC.cpp @@ -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); } |