Fixing some warnings on Linux

There were only a few warnings left, so I fixed them and enabled the unused variable warning by removing the "-Wno-unused" flag. Only the -Wno-unused-parameter remains for now (could be removed later).
Review URL: https://codereview.chromium.org/12480002

git-svn-id: http://skia.googlecode.com/svn/trunk@8030 2bbb7eff-a529-9590-31e7-b0007b416f81

8 files changed, 15 insertions, 14 deletions

diff --git a/src/animator/SkAnimator.cpp b/src/animator/SkAnimator.cpp
index 09fccd925d..acbb808c5c 100644
--- a/src/animator/SkAnimator.cpp
+++ b/src/animator/SkAnimator.cpp
@@ -409,9 +409,9 @@ bool SkAnimator::onEvent(const SkEvent& evt) {
 #endif
     if (evt.isType(SK_EventType_OnEnd)) {
         SkEventState eventState;
-        bool success = evt.findPtr("anim", (void**) &eventState.fDisplayable);
+        SkDEBUGCODE(bool success =) evt.findPtr("anim", (void**) &eventState.fDisplayable);
         SkASSERT(success);
-        success = evt.findS32("time", (int32_t*) &fMaker->fEnableTime);
+        SkDEBUGCODE(success =) evt.findS32("time", (int32_t*) &fMaker->fEnableTime);
         SkASSERT(success);
         fMaker->fAdjustedStart = fMaker->getAppTime() - fMaker->fEnableTime;
         fMaker->fEvents.doEvent(*fMaker, SkDisplayEvent::kOnEnd, &eventState);
diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp
index ca6cab0d34..b11c0a575c 100644
--- a/src/animator/SkScriptTokenizer.cpp
+++ b/src/animator/SkScriptTokenizer.cpp
@@ -603,8 +603,6 @@ scalarCommon:
         }
         if (ch ==  '.') {
             if (fTokenLength == 0) {
-                SkDEBUGCODE(SkScriptValue2 scriptValue;)
-                SkDEBUGCODE(scriptValue.fOperand.fObject = NULL);
                 int tokenLength = token_length(++script);
                 const char* token = script;
                 script += tokenLength;
@@ -1273,6 +1271,7 @@ bool SkScriptEngine2::ValueToString(const SkScriptValue2& value, SkString* strin
 }
 
 #ifdef SK_DEBUG
+#if defined(SK_SUPPORT_UNITTEST)
 
 #define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, NULL }
 #ifdef SK_SCALAR_IS_FLOAT
@@ -1475,6 +1474,7 @@ static const SkScriptNAnswer2 scriptTests[]  = {
 };
 
 #define SkScriptNAnswer_testCount    SK_ARRAY_COUNT(scriptTests)
+#endif  // SK_SUPPORT_UNITTEST
 
 void SkScriptEngine2::UnitTest() {
 #if defined(SK_SUPPORT_UNITTEST)
@@ -1506,6 +1506,7 @@ void SkScriptEngine2::UnitTest() {
                 SkASSERT(0);
         }
     }
-#endif
+#endif  // SK_SUPPORT_UNITTEST
 }
-#endif
+#endif  // SK_DEBUG
+
diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
index 02d6d383b7..5c3f5b3fe8 100644
--- a/src/gpu/gl/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/GrGLShaderBuilder.cpp
@@ -102,7 +102,7 @@ GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctxInfo,
 }
 
 void GrGLShaderBuilder::codeAppendf(ShaderType type, const char format[], va_list args) {
-    SkString* string;
+    SkString* string = NULL;
     switch (type) {
         case kVertex_ShaderType:
             string = &fVSCode;
@@ -120,7 +120,7 @@ void GrGLShaderBuilder::codeAppendf(ShaderType type, const char format[], va_lis
 }
 
 void GrGLShaderBuilder::codeAppend(ShaderType type, const char* str) {
-    SkString* string;
+    SkString* string = NULL;
     switch (type) {
         case kVertex_ShaderType:
             string = &fVSCode;
diff --git a/src/gpu/gr_unittests.cpp b/src/gpu/gr_unittests.cpp
index c7daf7718f..ab5049a36a 100644
--- a/src/gpu/gr_unittests.cpp
+++ b/src/gpu/gr_unittests.cpp
@@ -17,6 +17,7 @@ void gr_run_unittests();
 // If we aren't inheriting these as #defines from elsewhere,
 // clang demands they be declared before we #include the template
 // that relies on them.
+#if GR_DEBUG
 static bool LT(const int& elem, int value) {
     return elem < value;
 }
@@ -39,6 +40,7 @@ static void test_bsearch() {
         }
     }
 }
+#endif
 
 // bogus empty class for GrBinHashKey
 class BogusEntry {};
@@ -72,7 +74,7 @@ static void test_binHashKey()
 
 
 void gr_run_unittests() {
-    test_bsearch();
+    GR_DEBUGCODE(test_bsearch();)
     test_binHashKey();
     GrRedBlackTree<int>::UnitTest();
     GrDrawState::VertexAttributesUnitTest();
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index 438b47d46a..e1db69a4bd 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -249,7 +249,6 @@ SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
 
 static SkStream* open_stream(const FontConfigTypeface* face, int* ttcIndex) {
     SkStream* stream = face->getLocalStream();
-    int index;
     if (stream) {
         stream->ref();
         // should have been provided by CreateFromStream()
diff --git a/src/views/SkWidgets.cpp b/src/views/SkWidgets.cpp
index 202bf52930..e4547ec0e6 100644
--- a/src/views/SkWidgets.cpp
+++ b/src/views/SkWidgets.cpp
@@ -309,7 +309,7 @@ void SkPushButtonWidget::onDraw(SkCanvas* canvas)
     }
 }
 
-SkView::Click* SkPushButtonWidget::onFindClickHandler(SkScalar x, SkScalar y)
+SkView::Click* SkPushButtonWidget::onFindClickHandler(SkScalar x, SkScalar y, unsigned modi)
 {
     this->acceptFocus();
     return new Click(this);
diff --git a/src/views/animated/SkScrollBarView.cpp b/src/views/animated/SkScrollBarView.cpp
index 80ee49fdb3..d78cafafd7 100644
--- a/src/views/animated/SkScrollBarView.cpp
+++ b/src/views/animated/SkScrollBarView.cpp
@@ -122,12 +122,12 @@ void SkScrollBarView::adjust()
     int total = fTotalLength;
     int start = fStartPoint;
     int shown = fShownLength;
-    int hideBar = 0;
+//    int hideBar = 0;
 
     if (total <= 0 || shown <= 0 || shown >= total)    // no bar to show
     {
         total = 1;        // avoid divide-by-zero. should be done by skin/script
-        hideBar = 1;    // signal we don't want a thumb
+//        hideBar = 1;    // signal we don't want a thumb
     }
     else
     {
diff --git a/src/views/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp
index f6e32e42f2..5b6f101914 100644
--- a/src/views/unix/SkOSWindow_Unix.cpp
+++ b/src/views/unix/SkOSWindow_Unix.cpp
@@ -155,7 +155,6 @@ void SkOSWindow::post_linuxevent() {
     if (NULL == fUnixWindow.fDisplay) {
         return;
     }
-    long event_mask = NoEventMask;
     XClientMessageEvent event;
     event.type = ClientMessage;
     Atom myAtom(0);