Fix "unreachable code" warnings (MSVC warning 4702) in content/.

content/common/indexed_db/indexed_db_param_traits.cc

 // Copyright (c) 2012 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 "content/common/indexed_db/indexed_db_param_traits.h"
 
 #include <string>
 #include <vector>
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
@@ skipping 18 matching lines @@
 using blink::WebIDBKeyTypeString;
 
 namespace IPC {
 
 void ParamTraits<IndexedDBKey>::Write(Message* m, const param_type& p) {
   WriteParam(m, static_cast<int>(p.type()));
   switch (p.type()) {
     case WebIDBKeyTypeArray:
       WriteParam(m, p.array());
       return;
+

[jam, 2014/03/19 16:44:36]

ditto

[Peter Kasting, 2014/03/19 21:10:57]

Done.

     case WebIDBKeyTypeBinary:
       WriteParam(m, p.binary());
       return;
+
     case WebIDBKeyTypeString:
       WriteParam(m, p.string());
       return;
+
+
     case WebIDBKeyTypeDate:
       WriteParam(m, p.date());
       return;
+
     case WebIDBKeyTypeNumber:
       WriteParam(m, p.number());
       return;
+
     case WebIDBKeyTypeInvalid:
     case WebIDBKeyTypeNull:
       return;
+
     case WebIDBKeyTypeMin:
     default:
       NOTREACHED();
       return;
   }
 }
 
 bool ParamTraits<IndexedDBKey>::Read(const Message* m,
                                      PickleIterator* iter,
                                      param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
   WebIDBKeyType web_type = static_cast<WebIDBKeyType>(type);
-
   switch (web_type) {
     case WebIDBKeyTypeArray: {
       std::vector<IndexedDBKey> array;
       if (!ReadParam(m, iter, &array))
         return false;
       *r = IndexedDBKey(array);
       return true;
     }
+
     case WebIDBKeyTypeBinary: {
       std::string binary;
       if (!ReadParam(m, iter, &binary))
         return false;
       *r = IndexedDBKey(binary);
       return true;
     }
+
     case WebIDBKeyTypeString: {
       base::string16 string;
       if (!ReadParam(m, iter, &string))
         return false;
       *r = IndexedDBKey(string);
       return true;
     }
+
     case WebIDBKeyTypeDate:
     case WebIDBKeyTypeNumber: {
       double number;
       if (!ReadParam(m, iter, &number))
         return false;
       *r = IndexedDBKey(number, web_type);
       return true;
     }
+
     case WebIDBKeyTypeInvalid:
     case WebIDBKeyTypeNull:
       *r = IndexedDBKey(web_type);
       return true;
+
     case WebIDBKeyTypeMin:
     default:
       NOTREACHED();
       return false;
   }
-  NOTREACHED();
-  return false;
 }
 
 void ParamTraits<IndexedDBKey>::Log(const param_type& p, std::string* l) {
   l->append("<IndexedDBKey>(");
   LogParam(static_cast<int>(p.type()), l);
   l->append(", ");
   l->append("[");
   std::vector<IndexedDBKey>::const_iterator it = p.array().begin();
   while (it != p.array().end()) {
     Log(*it, l);
@@ skipping 11 matching lines @@
   LogParam(p.number(), l);
   l->append(")");
 }
 
 void ParamTraits<IndexedDBKeyPath>::Write(Message* m, const param_type& p) {
   WriteParam(m, static_cast<int>(p.type()));
   switch (p.type()) {
     case WebIDBKeyPathTypeArray:
       WriteParam(m, p.array());
       return;
+
     case WebIDBKeyPathTypeString:
       WriteParam(m, p.string());
       return;
+
     case WebIDBKeyPathTypeNull:
       return;
+
+    default:
+      NOTREACHED();
+      return;
   }
-  NOTREACHED();
 }
 
 bool ParamTraits<IndexedDBKeyPath>::Read(const Message* m,
                                          PickleIterator* iter,
                                          param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
-
   switch (type) {
     case WebIDBKeyPathTypeArray: {
       std::vector<base::string16> array;
       if (!ReadParam(m, iter, &array))
         return false;
       *r = IndexedDBKeyPath(array);
       return true;
     }
+
     case WebIDBKeyPathTypeString: {
       base::string16 string;
       if (!ReadParam(m, iter, &string))
         return false;
       *r = IndexedDBKeyPath(string);
       return true;
     }
+
     case WebIDBKeyPathTypeNull:
       *r = IndexedDBKeyPath();
       return true;
+
+    default:
+      NOTREACHED();
+      return false;
   }
-  NOTREACHED();
-  return false;
 }
 
 void ParamTraits<IndexedDBKeyPath>::Log(const param_type& p, std::string* l) {
   l->append("<IndexedDBKeyPath>(");
   LogParam(static_cast<int>(p.type()), l);
   l->append(", ");
   LogParam(p.string(), l);
   l->append(", ");
   l->append("[");
   std::vector<base::string16>::const_iterator it = p.array().begin();
@@ skipping 42 matching lines @@
   l->append(", upper=");
   LogParam(p.upper(), l);
   l->append(", lower_open=");
   LogParam(p.lowerOpen(), l);
   l->append(", upper_open=");
   LogParam(p.upperOpen(), l);
   l->append(")");
 }
 
 }  // namespace IPC