1 files changed, 61 insertions, 57 deletions
diff --git a/src/mongo/s/catalog/type_database.cpp b/src/mongo/s/catalog/type_database.cpp
index 222f46cf301..24de84c838c 100644
--- a/src/mongo/s/catalog/type_database.cpp
+++ b/src/mongo/s/catalog/type_database.cpp
@@ -38,82 +38,86 @@
 
 namespace mongo {
 
-    using std::string;
+using std::string;
 
-    const std::string DatabaseType::ConfigNS = "config.databases";
+const std::string DatabaseType::ConfigNS = "config.databases";
 
-    const BSONField<std::string> DatabaseType::name("_id");
-    const BSONField<std::string> DatabaseType::primary("primary");
-    const BSONField<bool> DatabaseType::sharded("partitioned");
+const BSONField<std::string> DatabaseType::name("_id");
+const BSONField<std::string> DatabaseType::primary("primary");
+const BSONField<bool> DatabaseType::sharded("partitioned");
 
 
-    StatusWith<DatabaseType> DatabaseType::fromBSON(const BSONObj& source) {
-        DatabaseType dbt;
+StatusWith<DatabaseType> DatabaseType::fromBSON(const BSONObj& source) {
+    DatabaseType dbt;
 
-        {
-            std::string dbtName;
-            Status status = bsonExtractStringField(source, name.name(), &dbtName);
-            if (!status.isOK()) return status;
+    {
+        std::string dbtName;
+        Status status = bsonExtractStringField(source, name.name(), &dbtName);
+        if (!status.isOK())
+            return status;
 
-            dbt._name = dbtName;
-        }
-
-        {
-            std::string dbtPrimary;
-            Status status = bsonExtractStringField(source, primary.name(), &dbtPrimary);
-            if (!status.isOK()) return status;
+        dbt._name = dbtName;
+    }
 
-            dbt._primary = dbtPrimary;
-        }
+    {
+        std::string dbtPrimary;
+        Status status = bsonExtractStringField(source, primary.name(), &dbtPrimary);
+        if (!status.isOK())
+            return status;
 
-        {
-            bool dbtSharded;
-            Status status = bsonExtractBooleanFieldWithDefault(source, sharded.name(), false, &dbtSharded);
-            if (!status.isOK()) return status;
+        dbt._primary = dbtPrimary;
+    }
 
-            dbt._sharded = dbtSharded;
-        }
+    {
+        bool dbtSharded;
+        Status status =
+            bsonExtractBooleanFieldWithDefault(source, sharded.name(), false, &dbtSharded);
+        if (!status.isOK())
+            return status;
 
-        return StatusWith<DatabaseType>(dbt);
+        dbt._sharded = dbtSharded;
     }
 
-    Status DatabaseType::validate() const {
-        if (!_name.is_initialized() || _name->empty()) {
-            return Status(ErrorCodes::NoSuchKey, "missing name");
-        }
+    return StatusWith<DatabaseType>(dbt);
+}
 
-        if (!_primary.is_initialized() || _primary->empty()) {
-            return Status(ErrorCodes::NoSuchKey, "missing primary");
-        }
+Status DatabaseType::validate() const {
+    if (!_name.is_initialized() || _name->empty()) {
+        return Status(ErrorCodes::NoSuchKey, "missing name");
+    }
 
-        if (!_sharded.is_initialized()) {
-            return Status(ErrorCodes::NoSuchKey, "missing sharded");
-        }
+    if (!_primary.is_initialized() || _primary->empty()) {
+        return Status(ErrorCodes::NoSuchKey, "missing primary");
+    }
 
-        return Status::OK();
+    if (!_sharded.is_initialized()) {
+        return Status(ErrorCodes::NoSuchKey, "missing sharded");
     }
 
-    BSONObj DatabaseType::toBSON() const {
-        BSONObjBuilder builder;
-        builder.append(name.name(), _name.get_value_or(""));
-        builder.append(primary.name(), _primary.get_value_or(""));
-        builder.append(sharded.name(), _sharded.get_value_or(false));
+    return Status::OK();
+}
 
-        return builder.obj();
-    }
+BSONObj DatabaseType::toBSON() const {
+    BSONObjBuilder builder;
+    builder.append(name.name(), _name.get_value_or(""));
+    builder.append(primary.name(), _primary.get_value_or(""));
+    builder.append(sharded.name(), _sharded.get_value_or(false));
 
-    std::string DatabaseType::toString() const {
-        return toBSON().toString();
-    }
+    return builder.obj();
+}
 
-    void DatabaseType::setName(const std::string& name) {
-        invariant(!name.empty());
-        _name = name;
-    }
+std::string DatabaseType::toString() const {
+    return toBSON().toString();
+}
 
-    void DatabaseType::setPrimary(const std::string& primary) {
-        invariant(!primary.empty());
-        _primary = primary;
-    }
+void DatabaseType::setName(const std::string& name) {
+    invariant(!name.empty());
+    _name = name;
+}
+
+void DatabaseType::setPrimary(const std::string& primary) {
+    invariant(!primary.empty());
+    _primary = primary;
+}
 
-} // namespace mongo
+}  // namespace mongo