Remove stringref::c_str()

The expected semantics of c_str() (a null-terminated string) cannot
be satisfied with a string reference, so remove the function entirely
to prevent people from using it in buggy ways.

Replaces c_str() with data() in places where it is presumed safe,
otherwise constructs temporary string instances. Certain callsites
have been de-stringref'd in favor of regular strings, in particular
where C APIs have been transitively called. The vast majority of
these were called with string parameters anyway, so should not
cause much extra allocation.

2 files changed, 6 insertions, 5 deletions

diff --git a/searchcorespi/src/vespa/searchcorespi/index/eventlogger.cpp b/searchcorespi/src/vespa/searchcorespi/index/eventlogger.cpp
index 9d824d69f93..cf1daf983b3 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/eventlogger.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/eventlogger.cpp
@@ -19,7 +19,7 @@ EventLogger::diskIndexLoadStart(const vespalib::string &indexDir)
     jstr.appendKey("input");
     LogUtil::logDir(jstr, indexDir, 6);
     jstr.endObject();
-    EV_STATE("diskindex.load.start", jstr.toString().c_str());
+    EV_STATE("diskindex.load.start", jstr.toString().data());
 }
 
 void
@@ -32,7 +32,7 @@ EventLogger::diskIndexLoadComplete(const vespalib::string &indexDir,
     jstr.appendKey("input");
     LogUtil::logDir(jstr, indexDir, 6);
     jstr.endObject();
-    EV_STATE("diskindex.load.complete", jstr.toString().c_str());
+    EV_STATE("diskindex.load.complete", jstr.toString().data());
 }
 
 void
@@ -50,7 +50,7 @@ EventLogger::diskFusionStart(const std::vector<vespalib::string> &sources,
     jstr.appendKey("output");
     LogUtil::logDir(jstr, fusionDir, 6);
     jstr.endObject();
-    EV_STATE("fusion.start", jstr.toString().c_str());
+    EV_STATE("fusion.start", jstr.toString().data());
 }
 
 void
@@ -63,7 +63,7 @@ EventLogger::diskFusionComplete(const vespalib::string &fusionDir,
     jstr.appendKey("output");
     LogUtil::logDir(jstr, fusionDir, 6);
     jstr.endObject();
-    EV_STATE("fusion.complete", jstr.toString().c_str());
+    EV_STATE("fusion.complete", jstr.toString().data());
 }
 
 }
diff --git a/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.cpp b/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.cpp
index 1dac8c7aafd..3180f7ed29d 100644
--- a/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/plugin/factoryloader.cpp
@@ -25,7 +25,8 @@ FactoryLoader::create(const stringref & factory)
     const FastOS_DynamicLibrary & lib = *_libraries.get(factory);
     FuncT registrationMethod = reinterpret_cast<FuncT>(lib.GetSymbol("createIndexManagerFactory"));
     if (registrationMethod == NULL) {
-        throw IllegalArgumentException(make_string("Failed locating symbol 'createIndexManagerFactory' in library '%s' for factory '%s'.", lib.GetLibName(), factory.c_str()));
+        throw IllegalArgumentException(make_string("Failed locating symbol 'createIndexManagerFactory' in library '%s' for factory '%s'.",
+                                                   lib.GetLibName(), vespalib::string(factory).c_str()));
     }
     return IIndexManagerFactory::UP(registrationMethod());
 }