commit 8afae61a57f87e4a50578effce6c428031499301
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 14 15:03:35 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 14 15:03:35 2012 +0000
tree ba9a4d4497a0416b932b384502e3b519af57e3a1
parent 9ed02b9da25a76ee4c73c1ab19c18b899a223a17

Clean up most clang warnings outside animator/

http://codereview.appspot.com/6464058/



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

tools/skdiff_main.cpp

diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp
index 3fc18e7..9c327df 100644
--- a/tools/skdiff_main.cpp
+++ b/tools/skdiff_main.cpp
@@ -773,14 +773,13 @@
             drp = new DiffRecord(*baseFiles[i], basePath, comparisonPath);
             SkASSERT(kUnknown == drp->fResult);
 
-            SkData* baseFileBits;
-            SkData* comparisonFileBits;
+            SkData* baseFileBits = NULL;
+            SkData* comparisonFileBits = NULL;
             if (NULL == (baseFileBits = read_file(basePath.c_str()))) {
                 SkDebugf("WARNING: couldn't read base file <%s>\n",
                          basePath.c_str());
                 drp->fResult = kBaseMissing;
-            } else if (NULL == (comparisonFileBits = read_file(
-                comparisonPath.c_str()))) {
+            } else if (NULL == (comparisonFileBits = read_file(comparisonPath.c_str()))) {
                 SkDebugf("WARNING: couldn't read comparison file <%s>\n",
                          comparisonPath.c_str());
                 drp->fResult = kComparisonMissing;