From 1e3b086749d4af4cdc44482d2b6da86ac40040db Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 31 Aug 2016 07:49:37 +0000 Subject: Revert r280200 and put it a proper fix PeekChar returns a character, we want the whole string there. llvm-svn: 280204 --- lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp') diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 49efeb883b0e..17f136c4c748 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -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 (); } -- cgit v1.2.3