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

1 files changed, 10 insertions, 15 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.