Merge branch 'siri/string-new-api'

* siri/string-new-api: (28 commits)
  hipe (test): Do not use deprecated functions in string(3)
  dialyzer (test): Do not use deprecated functions in string(3)
  eunit (test): Do not use deprecated functions in string(3)
  system (test): Do not use deprecated functions in string(3)
  system (test): Do not use deprecated functions in string(3)
  mnesia (test): Do not use deprecated functions in string(3)
  Deprecate old string functions
  observer: Do not use deprecated functions in string(3)
  common_test: Do not use deprecated functions in string(3)
  eldap: Do not use deprecated functions in string(3)
  et: Do not use deprecated functions in string(3)
  os_mon: Do not use deprecated functions in string(3)
  debugger: Do not use deprecated functions in string(3)
  runtime_tools: Do not use deprecated functions in string(3)
  asn1: Do not use deprecated functions in string(3)
  compiler: Do not use deprecated functions in string(3)
  sasl: Do not use deprecated functions in string(3)
  reltool: Do not use deprecated functions in string(3)
  kernel: Do not use deprecated functions in string(3)
  hipe: Do not use deprecated functions in string(3)
  ...

Conflicts:
	lib/eunit/src/eunit_lib.erl
	lib/observer/src/crashdump_viewer.erl
	lib/reltool/src/reltool_target.erl

5 files changed, 26 insertions, 31 deletions

diff --git a/lib/sasl/src/erlsrv.erl b/lib/sasl/src/erlsrv.erl
index 29d40d362f..e0bbd37ee3 100644
--- a/lib/sasl/src/erlsrv.erl
+++ b/lib/sasl/src/erlsrv.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ erlsrv(EVer) ->
     filename:join([Root, "erts-" ++ EVer, "bin", "erlsrv.exe"]).
 
 current_version() ->
-    hd(string:tokens(erlang:system_info(version),"_ ")).
+    hd(string:lexemes(erlang:system_info(version),"_ ")).
 
 %%% Returns {ok, Output} | failed | {error, Reason}
 run_erlsrv(Command) ->
@@ -107,7 +107,7 @@ get_all_services() ->
 	    [];
 	{ok, [_H|T]} ->
 	    F = fun(X) ->
-			hd(string:tokens(X,"\t "))
+			hd(string:lexemes(X,"\t "))
 		end,
 	    lists:map(F,T);
 	_ ->
@@ -191,8 +191,8 @@ get_service(EVer, ServiceName) ->
 	    %%% have in the environment list...
 	    EnvParts = lists:map(
 			 fun(S) ->
-				 X = string:strip(S,left,$\t),
-				 case hd(string:tokens(X,"=")) of
+				 X = string:trim(S, leading, "$\t"),
+				 case hd(string:lexemes(X,"=")) of
 				     X ->
 					 %% Can this happen?
 					 {X,""};
@@ -371,7 +371,7 @@ split_arglist([H|T]) ->
 parse_arglist(Str) ->
     lists:reverse(parse_arglist(Str,[])).
 parse_arglist(Str,Accum) ->
-    Stripped = string:strip(Str,left),
+    Stripped = string:trim(Str, leading),
     case length(Stripped) of
 	0 ->
 	    Accum;
@@ -432,14 +432,9 @@ split_by_env(Data) ->
 			
 
 splitline(Line) ->
-    case string:chr(Line,$:) of
-	0 ->
+    case string:split(Line, ":") of
+        [_] ->
 	    {Line, ""};
-	N ->
-	    case length(string:substr(Line,N)) of
-		1 ->
-		    {string:substr(Line,1,N-1),""};
-		_ ->
-		    {string:substr(Line,1,N-1),string:substr(Line,N+2)}
-	    end
+        [N, V] ->
+            {N, string:slice(V, 1)}
     end.
diff --git a/lib/sasl/src/format_lib_supp.erl b/lib/sasl/src/format_lib_supp.erl
index 80dcdc91da..cfe2ec7668 100644
--- a/lib/sasl/src/format_lib_supp.erl
+++ b/lib/sasl/src/format_lib_supp.erl
@@ -100,13 +100,13 @@ print_newlines(Device, N) when N > 0 ->
 print_one_line(Device, Line, Key, Value) ->
     Modifier = misc_supp:modifier(Device),
     StrKey = term_to_string(Key,Modifier),
-    KeyLen = lists:min([length(StrKey), Line]),
+    KeyLen = lists:min([string:length(StrKey), Line]),
     ValueLen = Line - KeyLen,
     Format1 = lists:concat(["~-", KeyLen, Modifier, "s"]),
     Format2 = lists:concat(["~", ValueLen, Modifier, "s~n"]),
     io:format(Device, Format1, [StrKey]),
     Try = term_to_string(Value,Modifier),
-    Length = length(Try),
+    Length = string:length(Try),
     if
 	Length < ValueLen ->
 	    io:format(Device, Format2, [Try]);
@@ -117,7 +117,7 @@ print_one_line(Device, Line, Key, Value) ->
     end.
 
 term_to_string(Value,Modifier) ->
-    lists:flatten(io_lib:format(get_format(Value,Modifier), [Value])).
+    io_lib:format(get_format(Value,Modifier), [Value]).
 
 get_format([],_) ->
     "~p";
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 6595d29a9c..28829132a1 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -586,14 +586,14 @@ find_widths([], _Modifier, DescrWidth, DateWidth, Data) ->
     {DescrWidth+1, DateWidth+1, lists:reverse(Data)};
 find_widths([H|T], Modifier, DescrWidth, DateWidth, Data) ->
     DescrTerm = element(3,H),
-    Descr = lists:flatten(io_lib:format("~"++Modifier++"w", [DescrTerm])),
-    DescrTry = length(Descr),
+    Descr = io_lib:format("~"++Modifier++"w", [DescrTerm]),
+    DescrTry = string:length(Descr),
     NewDescrWidth =
         if
             DescrTry > DescrWidth -> DescrTry;
             true -> DescrWidth
         end,
-    DateTry = length(element(4, H)),
+    DateTry = string:length(element(4, H)),
     NewDateWitdh =
         if
             DateTry > DateWidth -> DateTry;
diff --git a/lib/sasl/src/rb_format_supp.erl b/lib/sasl/src/rb_format_supp.erl
index 1eda43dae4..b5b7aba151 100644
--- a/lib/sasl/src/rb_format_supp.erl
+++ b/lib/sasl/src/rb_format_supp.erl
@@ -108,7 +108,7 @@ print(Date, Report, Device) ->
 
 format_h(Line, Header, Pid, Date) ->
     NHeader = lists:flatten(io_lib:format("~s  ~w", [Header, Pid])), 
-    DateLen = length(Date),
+    DateLen = string:length(Date),
     HeaderLen = Line - DateLen,
     Format = lists:concat(["~-", HeaderLen, "s~", DateLen, "s"]),
     io_lib:format(Format, [NHeader, Date]).
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index d0a7c7332d..bfa49fc05d 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -420,7 +420,7 @@ upgrade_app(App, NewDir) ->
 %%          located in the ebin dir of the _current_ version
 %%-----------------------------------------------------------------
 downgrade_app(App, OldDir) ->
-    case string:tokens(filename:basename(OldDir), "-") of
+    case string:lexemes(filename:basename(OldDir), "-") of
 	[_AppS, OldVsn] ->
 	    downgrade_app(App, OldVsn, OldDir);
 	_ ->
@@ -1174,8 +1174,8 @@ new_emulator_rm_tmp_release(_,_,_,_,Releases,_) ->
 
 %% Rename the tempoarary service (for erts ugprade) to the real ToVsn
 rename_tmp_service(EVsn,TmpVsn,NewVsn) ->
-    FromName = hd(string:tokens(atom_to_list(node()),"@")) ++ "_" ++ TmpVsn,
-    ToName = hd(string:tokens(atom_to_list(node()),"@")) ++ "_" ++ NewVsn,
+    FromName = hd(string:lexemes(atom_to_list(node()),"@")) ++ "_" ++ TmpVsn,
+    ToName = hd(string:lexemes(atom_to_list(node()),"@")) ++ "_" ++ NewVsn,
     case erlsrv:get_service(EVsn,ToName) of
 	{error, _Error} ->
 	    ok;
@@ -1207,9 +1207,9 @@ rename_service(EVsn,FromName,ToName) ->
 %%% in which case we try to rename the old service to the new name and try
 %%% to update heart's view of what service we are really running.
 do_make_services_permanent(PermanentVsn,Vsn, PermanentEVsn, EVsn) ->
-    PermName = hd(string:tokens(atom_to_list(node()),"@")) 
+    PermName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ PermanentVsn,
-    Name = hd(string:tokens(atom_to_list(node()),"@")) 
+    Name = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     case erlsrv:get_service(EVsn,Name) of
 	{error, _Error} ->
@@ -1296,7 +1296,7 @@ do_make_permanent(#state{releases = Releases,
 
 
 do_back_service(OldVersion, CurrentVersion,OldEVsn,CurrentEVsn) ->
-    NN = hd(string:tokens(atom_to_list(node()),"@")),
+    NN = hd(string:lexemes(atom_to_list(node()),"@")),
     OldName = NN ++ "_" ++ OldVersion,
     CurrentName = NN ++ "_" ++ CurrentVersion,
     UpdData = case erlsrv:get_service(CurrentEVsn,CurrentName) of
@@ -1385,7 +1385,7 @@ do_remove_service(Vsn) ->
     %% Very unconditionally remove the service.
     %% Note that the service could already have been removed when
     %% making another release permanent.
-    ServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    ServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     case erlsrv:get_service(ServiceName) of
 	{error, _Error} ->
@@ -1670,9 +1670,9 @@ flush() ->
 prepare_restart_nt(#release{erts_vsn = EVsn, vsn = Vsn},
 		   #release{erts_vsn = PermEVsn, vsn = PermVsn},
 		   DataFileName) ->
-    CurrentServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    CurrentServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ PermVsn,
-    FutureServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    FutureServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     CurrentService = case erlsrv:get_service(PermEVsn,CurrentServiceName) of
 			 {error, _} = Error1 ->