et: Improve handling of Unicode

1 files changed, 17 insertions, 17 deletions

diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl
index aba90b0be1..b0f016a8ea 100644
--- a/lib/et/src/et_collector.erl
+++ b/lib/et/src/et_collector.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -750,7 +750,7 @@ next_iterate(TH, Prev = first, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): First ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): First ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         First ->
             lookup_and_apply(TH, Prev, First, Limit, -1, Fun, Acc)
@@ -761,7 +761,7 @@ next_iterate(TH, Prev = last, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Last ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): Last ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Last ->
             lookup_and_apply(TH, Prev, Last, Limit, -1, Fun, Acc)
@@ -773,7 +773,7 @@ next_iterate(TH, Prev, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Next ~p -> ~p~n", [?MODULE, ?LINE, Key, Error]),
+            io:format("~p(~p): Next ~tp -> ~tp~n", [?MODULE, ?LINE, Key, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Next ->
             lookup_and_apply(TH, Prev, Next, Limit, -1, Fun, Acc)
@@ -785,7 +785,7 @@ prev_iterate(TH, Prev = first, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): First ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): First ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         First ->
             lookup_and_apply(TH, Prev, First, Limit, 1, Fun, Acc)
@@ -796,7 +796,7 @@ prev_iterate(TH, Prev = last, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Last ~p~n", [?MODULE, ?LINE, Error]),
+            io:format("~p(~p): Last ~tp~n", [?MODULE, ?LINE, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Last ->
             lookup_and_apply(TH, Prev, Last, Limit, 1, Fun, Acc)
@@ -808,7 +808,7 @@ prev_iterate(TH, Prev, Limit, Fun, Acc) ->
         '$end_of_table' ->
             Acc;
         {'EXIT', _} = Error ->
-            io:format("~p(~p): Prev ~p -> ~p~n", [?MODULE, ?LINE, Key, Error]),
+            io:format("~p(~p): Prev ~tp -> ~tp~n", [?MODULE, ?LINE, Key, Error]),
             iterate(TH#table_handle.collector_pid, Prev, Limit, Fun, Acc);
         Next ->
             lookup_and_apply(TH, Prev, Next, Limit, 1, Fun, Acc)
@@ -1049,7 +1049,7 @@ handle_call(stop, _From, S) ->
     end,
     {stop, shutdown, ok, S};
 handle_call(Request, From, S) ->
-    ok = error_logger:format("~p(~p): handle_call(~p, ~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_call(~tp, ~tp, ~tp)~n",
                              [?MODULE, self(), Request, From, S]),
     reply({error, {bad_request, Request}}, S).
 
@@ -1061,7 +1061,7 @@ handle_call(Request, From, S) ->
 %%----------------------------------------------------------------------
 
 handle_cast(Msg, S) ->
-    ok = error_logger:format("~p(~p): handle_cast(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_cast(~tp, ~tp)~n",
                              [?MODULE, self(), Msg, S]),
     noreply(S).
 
@@ -1083,18 +1083,18 @@ handle_info({nodeup, Node}, S) ->
             S2 = listen_on_trace_port(Node, Port, S),
 	    noreply(S2);
         {error, Reason} when Reason =:= already_started->
-            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~p~n",
+            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S2 = S#state{trace_port = Port + 1},
             noreply(S2);
         {badrpc, Reason} ->
-            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~p~n",
+            ok = error_logger:format("~p(~p): producer ignored(~p:~p):~n    ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S2 = S#state{trace_port = Port + 1},
             noreply(S2);
         {error, Reason} ->
             self() ! {nodeup, Node},
-            ok = error_logger:format("~p(~p): producer retry(~p:~p):~n     ~p~n",
+            ok = error_logger:format("~p(~p): producer retry(~p:~p):~n     ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S2 = S#state{trace_port = Port + 1},
             noreply(S2)
@@ -1125,12 +1125,12 @@ handle_info(Info = {'EXIT', Pid, Reason}, S) ->
 	    opt_unlink(S#state.parent_pid),
 	    {stop, Reason, S};
         false ->
-            ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
+            ok = error_logger:format("~p(~p): handle_info(~tp, ~tp)~n",
                                      [?MODULE, self(), Info, S]),
             noreply(S)
     end;
 handle_info(Info, S) ->
-    ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
+    ok = error_logger:format("~p(~p): handle_info(~tp, ~tp)~n",
                              [?MODULE, self(), Info, S]),
     noreply(S).
 
@@ -1143,12 +1143,12 @@ listen_on_trace_port(Node, Port, S) ->
             S#state{trace_nodes = [Node | S#state.trace_nodes],
 		    trace_port  = Port + 1};
         {'EXIT', Reason} when Reason =:= already_started->
-            ok = error_logger:format("~p(~p): consumer ignored(~p:~p): ~p~n",
+            ok = error_logger:format("~p(~p): consumer ignored(~p:~p): ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S#state{trace_port = Port + 1};
         {'EXIT', Reason} ->
             self() ! {nodeup, Node},
-            ok = error_logger:format("~p(~p): consumer retry(~p:~p):~n     ~p~n",
+            ok = error_logger:format("~p(~p): consumer retry(~p:~p):~n     ~tp~n",
                                      [?MODULE, self(), Node, Port, Reason]),
             S#state{trace_port = Port + 1}
     end.
@@ -1247,7 +1247,7 @@ file_open(F) ->
         {ok, _} ->
             {ok, Fd};
         {repaired, _, _, BadBytes} ->
-            ok = error_logger:format("~p: Skipped ~p bad bytes in file: ~p~n",
+            ok = error_logger:format("~p: Skipped ~p bad bytes in file: ~tp~n",
                                      [?MODULE, BadBytes, F#file.name]),
             {ok, Fd};
         {error,Reason} ->