[PATCH v3 8/8] gdb/linux-tdep: remove legacy parse_smaps_data overload

[Matthieu Longo <matthieu.longo@arm.com>]

Now that all callers use the target_file_reader overload of parse_smaps_data,
the legacy interface taking a raw buffer and file path separately is no
longer needed.

Fold its implementation into the target_file_reader version and remove the
obsolete wrapper.  This also simplifies the implementation by using the
target_file_reader accessors directly.

Reviewed-By: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Reviewed-By: Luis Machado <luis.machado.foss@gmail.com>
---
 gdb/linux-tdep.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index bb1870efe08..c928338406a 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -1581,14 +1581,14 @@ parse_smaps_key_value (const char *keyword, const char *line,
 /* Helper function to parse the contents of /proc/<pid>/smaps into a data
    structure, for easy access.
 
-   DATA is the contents of the smaps file.  The parsed contents are stored
-   into the SMAPS vector.  */
+   FREADER is a wrapper around the contents of the smaps file.
+   The parsed contents are returned as a vector.  */
 
 static std::vector<smaps_data>
-parse_smaps_data (gdb::array_view<char> data,
-		  const std::string &maps_filename)
+parse_smaps_data (const target_file_reader<char> &freader)
 {
   std::vector<smaps_data> smaps;
+  auto data = freader.view ();
 
   for (auto it = data.begin (); it != data.end ();)
     {
@@ -1649,8 +1649,9 @@ parse_smaps_data (gdb::array_view<char> data,
 
 	  if (sscanf (line, "%64s", keyword) != 1)
 	    {
-	      warning (_("Error parsing {s,}maps file '%s'"),
-		       maps_filename.c_str ());
+	      warning (_("error parsing keyword in {s,}maps file '%ps'"),
+		       styled_string (file_name_style.style (),
+				      freader.c_path ()));
 	      break;
 	    }
 
@@ -1664,12 +1665,12 @@ parse_smaps_data (gdb::array_view<char> data,
 	    decode_vmflags (line, &v);
 
 	  if (parse_smaps_key_value (keyword, line, "Rss:",
-				     maps_filename,
+				     freader.path (),
 				     &rss))
 	    continue;
 
 	  if (parse_smaps_key_value (keyword, line, "Swap:",
-				     maps_filename,
+				     freader.path (),
 				     &swap))
 	    continue;
 
@@ -1680,8 +1681,11 @@ parse_smaps_data (gdb::array_view<char> data,
 
 	      if (sscanf (line, "%*s%lu", &number) != 1)
 		{
-		  warning (_("Error parsing {s,}maps file '%s' number"),
-			   maps_filename.c_str ());
+		  warning (_("error parsing numeric value associated with "
+			     "key '%s' in {s,}maps file '%ps'"),
+			   keyword,
+			   styled_string (file_name_style.style (),
+					  freader.c_path ()));
 		  break;
 		}
 	      if (number > 0)
@@ -1736,12 +1740,6 @@ parse_smaps_data (gdb::array_view<char> data,
   return smaps;
 }
 
-static std::vector<smaps_data>
-parse_smaps_data (const target_file_reader<char> &freader)
-{
-  return parse_smaps_data (freader.view (), freader.path ());
-}
-
 /* Helper that checks if an address is in a memory tag page for a live
    process.  */
 
-- 
2.55.0