IndexedDB: ParseMethodAndError takes a leveldb::Status instance.

third_party/leveldatabase/env_chromium.cc

 // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "third_party/leveldatabase/env_chromium.h"
 
 #if defined(OS_POSIX)
 #include <dirent.h>
 #include <sys/types.h>
 #endif
@@ skipping 390 matching lines @@
 
 Status MakeIOError(Slice filename,
                    const std::string& message,
                    MethodID method) {
   char buf[512];
   snprintf(buf, sizeof(buf), "%s (ChromeMethodOnly: %d::%s)", message.c_str(),
            method, MethodIDToString(method));
   return Status::IOError(filename, buf);
 }
 
-ErrorParsingResult ParseMethodAndError(const char* string,
+ErrorParsingResult ParseMethodAndError(const leveldb::Status& status,
                                        MethodID* method_param,
                                        int* error) {
+  std::string str = status.ToString();

[dgrogan, 2014/12/15 21:55:30]

Change the variable name so status_string, or something more descriptive than
"str".

Also, since you call c_str() on this everywhere that it's used, maybe you want
to change this to a char*?

[cmumford, 2014/12/15 22:26:11]

I renamed it to "status_string". I couldn't make it a char* because it would
point to a temporary stack result (ToString's return value). Let me know if I
misunderstood your request.

[dgrogan, 2014/12/15 22:31:48]

I think you understood it but now I'm confused. Won't ToString's return value
exist for the duration of this function call? As in, I could understand not
wanting to return the char* from this function, but just using it internally
should be fine.

In any case, this is trivial, so feel free to submit.

   int method;
-  if (RE2::PartialMatch(string, "ChromeMethodOnly: (\\d+)", &method)) {
+  if (RE2::PartialMatch(str.c_str(), "ChromeMethodOnly: (\\d+)", &method)) {
     *method_param = static_cast<MethodID>(method);
     return METHOD_ONLY;
   }
-  if (RE2::PartialMatch(
-          string, "ChromeMethodPFE: (\\d+)::.*::(\\d+)", &method, error)) {
+  if (RE2::PartialMatch(str.c_str(), "ChromeMethodPFE: (\\d+)::.*::(\\d+)",
+                        &method, error)) {
     *error = -*error;
     *method_param = static_cast<MethodID>(method);
     return METHOD_AND_PFE;
   }
-  if (RE2::PartialMatch(
-          string, "ChromeMethodErrno: (\\d+)::.*::(\\d+)", &method, error)) {
+  if (RE2::PartialMatch(str.c_str(), "ChromeMethodErrno: (\\d+)::.*::(\\d+)",
+                        &method, error)) {
     *method_param = static_cast<MethodID>(method);
     return METHOD_AND_ERRNO;
   }
   return NONE;
 }
 
 // Keep in sync with LevelDBCorruptionTypes in histograms.xml. Also, don't
 // change the order because indices into this array have been recorded in uma
 // histograms.
 const char* patterns[] = {
@@ skipping 58 matching lines @@
   if (code == 0)
     return "Unknown corruption";
   return patterns[code - 1];
 }
 
 bool IndicatesDiskFull(const leveldb::Status& status) {
   if (status.ok())
     return false;
   leveldb_env::MethodID method;
   int error = -1;
-  leveldb_env::ErrorParsingResult result = leveldb_env::ParseMethodAndError(
-      status.ToString().c_str(), &method, &error);
+  leveldb_env::ErrorParsingResult result =
+      leveldb_env::ParseMethodAndError(status, &method, &error);
   return (result == leveldb_env::METHOD_AND_PFE &&
           static_cast<base::File::Error>(error) ==
               base::File::FILE_ERROR_NO_SPACE) ||
          (result == leveldb_env::METHOD_AND_ERRNO && error == ENOSPC);
 }
 
 bool IsIOError(const leveldb::Status& status) {
   leveldb_env::MethodID method;
   int error = -1;
-  leveldb_env::ErrorParsingResult result = leveldb_env::ParseMethodAndError(
-      status.ToString().c_str(), &method, &error);
+  leveldb_env::ErrorParsingResult result =
+      leveldb_env::ParseMethodAndError(status, &method, &error);
   return result != leveldb_env::NONE;
 }
 
 bool ChromiumEnv::MakeBackup(const std::string& fname) {
   FilePath original_table_name = FilePath::FromUTF8Unsafe(fname);
   FilePath backup_table_name =
       original_table_name.ReplaceExtension(backup_table_extension);
   return base::CopyFile(original_table_name, backup_table_name);
 }
 
@@ skipping 558 matching lines @@
 
 Env* IDBEnv() {
   return leveldb_env::idb_env.Pointer();
 }
 
 Env* Env::Default() {
   return leveldb_env::default_env.Pointer();
 }
 
 }  // namespace leveldb