From 70a5ef15bdf637e90f0585104eb6abbe3abcb036 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Sat, 27 Aug 2016 16:38:11 +0000 Subject: [PATCH] Fix some build bot breakages. There was some code that was ifdef'ed out that I didn't catch in my earlier patch. llvm-svn: 279920 --- .../Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp | 10 +++++----- .../gdb-remote/GDBRemoteCommunicationServerPlatform.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp index 1472b65..bf9a25e 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp @@ -418,7 +418,7 @@ GDBRemoteCommunicationServerCommon::Handle_qUserName (StringExtractorGDBRemote & { StreamString response; response.PutCStringAsRawHex8 (name.c_str()); - return SendPacketNoLock (response.GetData(), response.GetSize()); + return SendPacketNoLock (response.GetString()); } } if (log) @@ -442,7 +442,7 @@ GDBRemoteCommunicationServerCommon::Handle_qGroupName (StringExtractorGDBRemote { StreamString response; response.PutCStringAsRawHex8 (name.c_str()); - return SendPacketNoLock (response.GetData(), response.GetSize()); + return SendPacketNoLock (response.GetString()); } } #endif @@ -561,7 +561,7 @@ GDBRemoteCommunicationServerCommon::Handle_vFile_pRead (StringExtractorGDBRemote if (count == UINT64_MAX) { response.Printf("F-1:%i", EINVAL); - return SendPacketNoLock(response.GetData(), response.GetSize()); + return SendPacketNoLock(response.GetString()); } std::string buffer(count, 0); @@ -576,7 +576,7 @@ GDBRemoteCommunicationServerCommon::Handle_vFile_pRead (StringExtractorGDBRemote response.PutChar(';'); response.PutEscapedBytes(&buffer[0], bytes_read); } - return SendPacketNoLock(response.GetData(), response.GetSize()); + return SendPacketNoLock(response.GetString()); } } return SendErrorResponse(21); @@ -614,7 +614,7 @@ GDBRemoteCommunicationServerCommon::Handle_vFile_pWrite (StringExtractorGDBRemot { response.Printf ("-1,%i", EINVAL); } - return SendPacketNoLock(response.GetData(), response.GetSize()); + return SendPacketNoLock(response.GetString()); } } return SendErrorResponse(27); diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp index b56d771..4f11a03 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp @@ -217,7 +217,7 @@ GDBRemoteCommunicationServerPlatform::Handle_qLaunchGDBServer (StringExtractorGD response.PutChar(';'); } - PacketResult packet_result = SendPacketNoLock(response.GetData(), response.GetSize()); + PacketResult packet_result = SendPacketNoLock(response.GetString()); if (packet_result != PacketResult::Success) { if (debugserver_pid != LLDB_INVALID_PROCESS_ID) -- 2.7.4