Fixes for re-enabling more MSVC level 4 warnings: misc edition #2

sql/recovery.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sql/recovery.h"
 
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 337 matching lines @@
   // to the recovered table.
   std::vector<std::string> insert_columns;
 
   // If PRIMARY KEY is a single INTEGER column, then it is an alias
   // for ROWID.  The primary key can be compound, so this can only be
   // determined after processing all column data and tracking what is
   // seen.  |pk_column_count| counts the columns in the primary key.
   // |rowid_decl| stores the ROWID version of the last INTEGER column
   // seen, which is at |rowid_ofs| in |create_column_decls|.
   size_t pk_column_count = 0;
-  size_t rowid_ofs;  // Only valid if rowid_decl is set.
+  size_t rowid_ofs = 0;  // Only valid if rowid_decl is set.
   std::string rowid_decl;  // ROWID version of column |rowid_ofs|.
 
   while (s.Step()) {
     const std::string column_name(s.ColumnString(1));
     const std::string column_type(s.ColumnString(2));
     const bool not_null = s.ColumnBool(3);
     const int default_type = s.ColumnType(4);
     const bool default_is_null = (default_type == COLUMN_TYPE_NULL);
     const int pk_column = s.ColumnInt(5);
 
     if (pk_column > 0) {
       // TODO(shess): http://www.sqlite.org/pragma.html#pragma_table_info
       // documents column 5 as the index of the column in the primary key
       // (zero for not in primary key).  I find that it is always 1 for
       // columns in the primary key.  Since this code is very dependent on
       // that pragma, review if the implementation changes.
-      DCHECK_EQ(pk_column, 1);
+      DCHECK_EQ(1, pk_column);
       ++pk_column_count;
     }
 
     // Construct column declaration as "name type [optional constraint]".
     std::string column_decl = column_name;
 
     // SQLite's affinity detection is documented at:
     // http://www.sqlite.org/datatype3.html#affname
     // The gist of it is that CHAR, TEXT, and INT use substring matches.
     // TODO(shess): It would be nice to unit test the type handling,
@@ skipping 141 matching lines @@
     }
     return false;
   }
 
   RecordRecoveryEvent(RECOVERY_SUCCESS_META_VERSION);
   *version = recovery_version.ColumnInt(0);
   return true;
 }
 
 }  // namespace sql