c_str -> data

7 files changed, 8 insertions, 8 deletions

diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
index ca8274aab00..54fc072c2b1 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -298,7 +298,7 @@ public:
     {
     }
     virtual RPC::Result receive(const Packet &packet) override {
-        vespalib::nbostream_longlivedbuf handle(packet.getHandle().c_str(), packet.getHandle().size());
+        vespalib::nbostream_longlivedbuf handle(packet.getHandle().data(), packet.getHandle().size());
         try {
             while (handle.size() > 0) {
                 Packet::Entry entry;
diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp
index e5ac6ed15b0..6d7bd243e71 100644
--- a/searchcore/src/tests/grouping/grouping.cpp
+++ b/searchcore/src/tests/grouping/grouping.cpp
@@ -168,7 +168,7 @@ TEST_F("testGroupingContextInitialization", DoomFixture()) {
     nos << (uint32_t)1;
     baseRequest.serialize(nos);
 
-    GroupingContext context(f1.clock, f1.timeOfDoom, os.c_str(), os.size());
+    GroupingContext context(f1.clock, f1.timeOfDoom, os.data(), os.size());
     ASSERT_TRUE(!context.empty());
     GroupingContext::GroupingList list = context.getGroupingList();
     ASSERT_TRUE(list.size() == 1);
@@ -226,7 +226,7 @@ TEST_F("testGroupingContextSerializing", DoomFixture()) {
     context.serialize();
     vespalib::nbostream & res(context.getResult());
     EXPECT_EQUAL(res.size(), os.size());
-    ASSERT_TRUE(memcmp(res.c_str(), os.c_str(), res.size()) == 0);
+    ASSERT_TRUE(memcmp(res.data(), os.data(), res.size()) == 0);
 }
 
 TEST_F("testGroupingManager", DoomFixture()) {
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index 8c4bf0d55b0..95ab43dbcba 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -616,7 +616,7 @@ TEST("require that grouping is performed (multi-threaded)") {
             Grouping grequest;
             grequest.setRoot(Group().addResult(SumAggregationResult().setExpression(createAttr())));
             grequest.serialize(os);
-            request->groupSpec.assign(buf.c_str(), buf.c_str() + buf.size());
+            request->groupSpec.assign(buf.data(), buf.data() + buf.size());
         }
         SearchReply::UP reply = world.performSearch(request, threads);
         {
diff --git a/searchcore/src/tests/proton/matching/request_context/request_context_test.cpp b/searchcore/src/tests/proton/matching/request_context/request_context_test.cpp
index 109a4cc7a25..c3338a973c4 100644
--- a/searchcore/src/tests/proton/matching/request_context/request_context_test.cpp
+++ b/searchcore/src/tests/proton/matching/request_context/request_context_test.cpp
@@ -36,7 +36,7 @@ private:
     void insert_tensor_in_properties(const vespalib::string& tensor_name, const Value& tensor_value) {
         vespalib::nbostream stream;
         DefaultTensorEngine::ref().encode(tensor_value, stream);
-        _props.add(tensor_name, vespalib::stringref(stream.c_str(), stream.size()));
+        _props.add(tensor_name, vespalib::stringref(stream.data(), stream.size()));
     }
 
 public:
diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp
index 96096c0401f..ca48fb773d8 100644
--- a/searchcore/src/tests/proton/server/feedstates_test.cpp
+++ b/searchcore/src/tests/proton/server/feedstates_test.cpp
@@ -105,7 +105,7 @@ RemoveOperationContext::RemoveOperationContext(search::SerialNum serial)
       str(), packet()
 {
     op.serialize(str);
-    ConstBufferRef buf(str.c_str(), str.wp());
+    ConstBufferRef buf(str.data(), str.wp());
     packet.reset(new Packet());
     packet->add(Packet::Entry(serial, FeedOperation::REMOVE, buf));
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp
index 5a6a990df9b..faee5914a97 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp
@@ -49,7 +49,7 @@ handleProgress(TlsReplayProgress &progress, SerialNum currentSerial)
 void
 handlePacket(PacketWrapper::SP wrap, EntryHandler entryHandler)
 {
-    vespalib::nbostream_longlivedbuf handle(wrap->packet.getHandle().c_str(), wrap->packet.getHandle().size());
+    vespalib::nbostream_longlivedbuf handle(wrap->packet.getHandle().data(), wrap->packet.getHandle().size());
     while (handle.size() > 0) {
         Packet::Entry entry;
         entry.deserialize(handle);
diff --git a/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp
index bfc59dee35e..bbd02d7efce 100644
--- a/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp
@@ -14,7 +14,7 @@ namespace proton {
 void TlcProxy::commit(search::SerialNum serialNum, search::transactionlog::Type type,
                       const vespalib::nbostream &buf, DoneCallback onDone)
 {
-    Packet::Entry entry(serialNum, type, vespalib::ConstBufferRef(buf.c_str(), buf.size()));
+    Packet::Entry entry(serialNum, type, vespalib::ConstBufferRef(buf.data(), buf.size()));
     Packet packet;
     packet.add(entry);
     packet.close();