some more cleanup

5 files changed, 6 insertions, 7 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 1c901097812..db6116073e6 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -213,7 +213,9 @@ public:
                                                    _tuneFileDocumentDB, _hwInfo);
         _configMgr.forwardConfig(b);
         _configMgr.nextGeneration(0);
-        if (! FastOS_File::MakeDirectory((std::string("tmpdb/") + docTypeName).c_str())) { LOG_ABORT("should not be reached"); }
+        if (! FastOS_File::MakeDirectory((std::string("tmpdb/") + docTypeName).c_str())) {
+            LOG_ABORT("should not be reached");
+        }
         _ddb.reset(new DocumentDB("tmpdb", _configMgr.getConfig(), "tcp/localhost:9013", _queryLimiter, _clock,
                                   DocTypeName(docTypeName), makeBucketSpace(),
 				  *b->getProtonConfigSP(), *this, _summaryExecutor, _summaryExecutor,
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
index 9b596d6e992..577d6e7edf5 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
@@ -69,7 +69,7 @@ FastS_FNET_SearchNode::FastS_FNET_SearchNode(FastS_FNET_SearchNode &&)
 {
     // These objects are referenced everywhere and must never be either copied nor moved,
     // but as std::vector requires this to exist so we do this little trick.
-    assert(false);
+    LOG_ABORT("should not reach here");
 }
 
 bool
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_directory.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_directory.cpp
index a00ec759647..f2e4ac4905d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_directory.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_directory.cpp
@@ -92,8 +92,7 @@ AttributeDirectory::saveSnapInfo()
 {
     if (!_snapInfo.save()) {
         vespalib::string dirName(getDirName());
-        LOG(warning,
-            "Could not save meta-info file for attribute vector '%s' to disk",
+        LOG(warning, "Could not save meta-info file for attribute vector '%s' to disk",
             dirName.c_str());
         LOG_ABORT("should not be reached");
     }
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
index 6a000973165..20306e92ea8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
@@ -26,7 +26,6 @@ getRepo(const std::vector<IFeedView::SP> &views)
         return view->getDocumentTypeRepo();
     }
     LOG_ABORT("should not be reached");
-    return std::shared_ptr<const DocumentTypeRepo>();
 }
 
 };
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
index f91892114ea..80809d76bef 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
@@ -291,8 +291,7 @@ DocumentDBConfigManager::update(const ConfigSnapshot &snapshot)
         search::index::Schema schema;
         search::index::SchemaBuilder::build(*newIndexschemaConfig, schema);
         if (!search::index::SchemaUtil::validateSchema(schema)) {
-            LOG(error, "Cannot use bad index schema, validation failed");
-            LOG_ABORT("should not be reached");
+            LOG_ABORT("Cannot use bad index schema, validation failed");
         }
     }
     if (snapshot.isChanged<AttributesConfig>(_configId, currentGeneration)) {