From fb9235e7c3a6872a1394e5ba0c78217d9617f8e3 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 6 Jul 2017 17:25:37 +0200
Subject: observer: Do not use deprecated functions in string(3)

---
 lib/observer/src/crashdump_viewer.erl | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'lib/observer/src/crashdump_viewer.erl')

diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 8d70f5e2c8..a9fa1aa624 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -810,7 +810,7 @@ do_read_file(File) ->
 			    check_if_truncated(),
 			    [{DumpVsn0,_}] = lookup_index(?erl_crash_dump),
 			    DumpVsn = [list_to_integer(L) ||
-					L<-string:tokens(DumpVsn0,".")],
+					L<-string:lexemes(DumpVsn0,".")],
 			    Binaries = read_binaries(Fd,DumpVsn),
 			    close(Fd),
 			    {ok,Binaries,DumpVsn};
@@ -1220,12 +1220,12 @@ parse_monitor("{"++Str) ->
     %% Named process
     {Name,Node,Rest1} = parse_name_node(Str,[]),
     Pid = get_pid_from_name(Name,Node),
-    case parse_link(string:strip(Rest1,left,$,),[]) of
+    case parse_link(string:trim(Rest1,leading,","),[]) of
 	{Ref,"}"++Rest2} ->
 	    %% Bug in break.c - prints an extra "}" for remote
 	    %% nodes... thus the strip
 	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},
-	     string:strip(Rest2,left,$})};
+	     string:trim(Rest2,leading,"}")};
 	{Ref,[]} ->
 	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},[]}
     end;
@@ -1491,7 +1491,7 @@ get_ports(File) ->
 %% Converting port string to tuple to secure correct sorting. This is
 %% converted back in cdv_port_cb:format/1.
 port_to_tuple("#Port<"++Port) ->
-    [I1,I2] = string:tokens(Port,".>"),
+    [I1,I2] = string:lexemes(Port,".>"),
     {list_to_integer(I1),list_to_integer(I2)}.
 
 get_portinfo(Fd,Port) ->
@@ -1514,9 +1514,9 @@ get_portinfo(Fd,Port) ->
 	"Registered as" ->
 	    get_portinfo(Fd,Port#port{name=val(Fd)});
 	"Monitors" ->
-	    Monitors0 = string:tokens(val(Fd),"()"),
+	    Monitors0 = string:lexemes(val(Fd),"()"),
 	    Monitors = [begin
-			    [Pid,Ref] = string:tokens(Mon,","),
+			    [Pid,Ref] = string:lexemes(Mon,","),
 			    {Pid,Pid++" ("++Ref++")"}
 			end || Mon <- Monitors0],
 	    get_portinfo(Fd,Port#port{monitors=Monitors});
@@ -1577,7 +1577,7 @@ get_etsinfo(Fd,EtsTable = #ets_table{details=Ds},WS) ->
 	"Buckets" ->
 	    %% A bug in erl_db_hash.c prints a space after the buckets
 	    %% - need to strip the string to make list_to_integer/1 happy.
-	    Buckets = list_to_integer(string:strip(val(Fd))),
+	    Buckets = list_to_integer(string:trim(val(Fd),both,"\s")),
 	    get_etsinfo(Fd,EtsTable#ets_table{buckets=Buckets},WS);
 	"Objects" ->
 	    get_etsinfo(Fd,EtsTable#ets_table{size=list_to_integer(val(Fd))},WS);
@@ -1595,7 +1595,9 @@ get_etsinfo(Fd,EtsTable = #ets_table{details=Ds},WS) ->
 	    Val = val(Fd),
 	    get_etsinfo(Fd,EtsTable#ets_table{details=Ds#{chain_min=>Val}},WS);
 	"Chain Length Avg" ->
-	    Val = try list_to_float(string:strip(val(Fd))) catch _:_ -> "-" end,
+	    Val = try list_to_float(string:trim(val(Fd),both,"\s"))
+                  catch _:_ -> "-"
+                  end,
 	    get_etsinfo(Fd,EtsTable#ets_table{details=Ds#{chain_avg=>Val}},WS);
 	"Chain Length Max" ->
 	    Val = val(Fd),
@@ -1752,7 +1754,7 @@ get_nodeinfo(Fd,Nod) ->
 	    Creations = lists:flatmap(fun(C) -> try [list_to_integer(C)]
 						catch error:badarg -> []
 						end
-				      end, string:tokens(val(Fd)," ")),
+				      end, string:lexemes(val(Fd)," ")),
 	    get_nodeinfo(Fd,Nod#nod{creation={creations,Creations}});
 	"Remote link" ->
 	    Procs = val(Fd), % e.g. "<0.31.0> <4322.54.0>"
@@ -2198,7 +2200,7 @@ get_size_value(Key,Data) ->
 %% and Value is the sum over all allocator instances of each type.
 sort_allocator_types([{Name,Data}|Allocators],Acc,DoTotal) ->
     Type =
-	case string:tokens(Name,"[]") of
+	case string:lexemes(Name,"[]") of
 	    [T,_Id] -> T;
 	    [Name] -> Name;
             Other -> Other
-- 
cgit v1.2.3