maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r280200 and put it a proper fix 

PeekChar returns a character, we want the whole string there.

llvm-svn: 280204
This commit is contained in:
Pavel Labath 2016-08-31 07:49:37 +00:00
parent e4f590faeb
commit 1e3b086749
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
View File

@ -1620,7 +1620,7 @@ ParseMemoryRegionInfoFromProcMapsLine (const std::string &maps_line, MemoryRegio
{
memory_region_info.Clear();
StringExtractor line_extractor (maps_line.c_str ());
StringExtractor line_extractor (maps_line);
// Format: {address_start_hex}-{address_end_hex} perms offset dev inode pathname
// perms: rwxp (letter is present if set, '-' if not, final character is p=private, s=shared).
@ -1687,9 +1687,7 @@ ParseMemoryRegionInfoFromProcMapsLine (const std::string &maps_line, MemoryRegio
line_extractor.GetU64(0, 10); // Read the inode number
line_extractor.SkipSpaces();
const char* name = line_extractor.PeekChar();
if (name)
memory_region_info.SetName(name);
memory_region_info.SetName(line_extractor.Peek().str().c_str());
return Error ();
}

3
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
View File

@ -1257,7 +1257,8 @@ GDBRemoteCommunicationServerLLGS::Handle_c (StringExtractorGDBRemote &packet)
if (has_continue_address)
{
if (log)
log->Printf ("GDBRemoteCommunicationServerLLGS::%s not implemented for c{address} variant [%s remains]", __FUNCTION__, packet.Peek ());
log->Printf("GDBRemoteCommunicationServerLLGS::%s not implemented for c{address} variant [%s remains]",
__FUNCTION__, packet.Peek().str().c_str());
return SendUnimplementedResponse (packet.GetStringRef().c_str());
}