[reltool] Change ~s to ~ts and ~p to ~tp when appropriate

1 files changed, 47 insertions, 47 deletions

diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index c56e29152d..5e25f22a6f 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -399,12 +399,12 @@ loop(#state{sys = Sys} = S) ->
         {'EXIT', Pid, Reason} when Pid =:= S#state.parent_pid ->
             exit(Reason);
         {call, ReplyTo, Ref, Msg} when is_pid(ReplyTo), is_reference(Ref) ->
-            error_logger:format("~p~p got unexpected call:\n\t~p\n",
+            error_logger:format("~w~w got unexpected call:\n\t~p\n",
                                 [?MODULE, self(), Msg]),
             reltool_utils:reply(ReplyTo, Ref, {error, {invalid_call, Msg}}),
             ?MODULE:loop(S);
         Msg ->
-            error_logger:format("~p~p got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~p\n",
                                 [?MODULE, self(), Msg]),
             ?MODULE:loop(S)
     end.
@@ -422,7 +422,7 @@ do_set_apps(#state{sys = Sys} = S, ChangedApps) ->
 %% 2) removing #app records if no configurable fields are set
 %% 3) keeping #app records that are not changed
 app_update_config([#app{name=Name,is_escript={inlined,Escript}}|_],_SysApps) ->
-    reltool_utils:throw_error("Application ~p is inlined in ~p. Can not change "
+    reltool_utils:throw_error("Application ~w is inlined in ~w. Can not change "
 			      "configuration for an inlined application.",
 			      [Name,Escript]);
 app_update_config([Config|Configs],SysApps) ->
@@ -580,8 +580,8 @@ apps_in_rel(#rel{name = RelName, rel_apps = RelApps}, Apps) ->
 					IA;
 				    false ->
 					reltool_utils:throw_error(
-					  "Release ~p uses non existing "
-					  "application ~p",
+					  "Release ~tp uses non existing "
+					  "application ~w",
 					  [RelName,RA#rel_app.name])
 				end;
 			    IA ->
@@ -602,7 +602,7 @@ more_apps_in_rels([{RelName, AppName} = RA | RelApps], Apps, Acc) ->
 		    more_apps_in_rels(RelApps, Apps, Acc2);
 		false ->
 		    reltool_utils:throw_error(
-		      "Release ~p uses non existing application ~p",
+		      "Release ~tp uses non existing application ~w",
 		      [RelName,AppName])
 	    end
     end;
@@ -640,7 +640,7 @@ app_init_is_included(#state{app_tab = AppTab, mod_tab = ModTab, sys=Sys},
 		{undefined, false, false, Status};
             {exclude, [RelName | _]} -> % App is included in at least one rel
 		reltool_utils:throw_error(
-		  "Application ~p is used in release ~p and cannot be excluded",
+		  "Application ~w is used in release ~tp and cannot be excluded",
 		  [AppName,RelName]);
             {derived, []} ->
 		{undefined, undefined, undefined, Status};
@@ -665,7 +665,7 @@ app_init_is_included(#state{app_tab = AppTab, mod_tab = ModTab, sys=Sys},
     Status3.
 
 mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
-    %% print(M#mod.name, hipe, "incl_cond -> ~p\n", [AppCond]),
+    %% print(M#mod.name, hipe, "incl_cond -> ~w\n", [AppCond]),
     IsIncl =
         case AppCond of
             include ->
@@ -677,7 +677,7 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
 		    derived ->
 			undefined;
                     undefined ->
-                        %% print(M#mod.name, hipe, "mod_cond -> ~p\n",
+                        %% print(M#mod.name, hipe, "mod_cond -> ~w\n",
 			%%       [ModCond]),
                         case ModCond of
                             all     -> true;
@@ -711,23 +711,23 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
 		    {false,_} ->
 			ets:insert(ModTab, M2),
 			reltool_utils:add_warning(
-			  "Module ~p exists in applications ~p and ~p. "
-			  "Using module from application ~p.",
+			  "Module ~w exists in applications ~w and ~w. "
+			  "Using module from application ~w.",
 			  [M#mod.name, Existing#mod.app_name,
 			   M#mod.app_name, M#mod.app_name],
 			  Status);
 		    {_,false} ->
 			%% Don't insert in ModTab - using Existing
 			reltool_utils:add_warning(
-			  "Module ~p exists in applications ~p and ~p. "
-			  "Using module from application ~p.",
+			  "Module ~w exists in applications ~w and ~w. "
+			  "Using module from application ~w.",
 			  [M#mod.name, Existing#mod.app_name,
 			   M#mod.app_name,Existing#mod.app_name],
 			  Status);
 		    {_,_} ->
 			reltool_utils:throw_error(
-			  "Module ~p potentially included by two different "
-			  "applications: ~p and ~p.",
+			  "Module ~w potentially included by two different "
+			  "applications: ~w and ~w.",
 			  [M#mod.name,Existing#mod.app_name,M#mod.app_name])
 		end;
 	    [] ->
@@ -735,7 +735,7 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
 		Status
 	end,
 
-    %% print(M#mod.name, hipe, "~p -> ~p\n", [M2, IsIncl]),
+    %% print(M#mod.name, hipe, "~p -> ~w\n", [M2, IsIncl]),
     {M2,Status2}.
 
 false_to_undefined(Bool) ->
@@ -888,7 +888,7 @@ mod_recap_dependencies(S, A, [#mod{name = ModName}=M1 | Mods], Acc, IsIncl) ->
     case ets:lookup(S#state.mod_tab, ModName) of
 	[M2] when M2#mod.app_name=:=A#app.name ->
 	    ModStatus = do_get_status(M2),
-	    %% print(M2#mod.name, hipe, "status -> ~p\n", [ModStatus]),
+	    %% print(M2#mod.name, hipe, "status -> ~w\n", [ModStatus]),
 	    {IsIncl2, M3} =
 		case M2#mod.is_included of
 		    true ->
@@ -910,8 +910,8 @@ mod_recap_dependencies(S, A, [#mod{name = ModName}=M1 | Mods], Acc, IsIncl) ->
 	    %% A module is potensially included by multiple
 	    %% applications. This is not allowed!
 	    reltool_utils:throw_error(
-	      "Module ~p potentially included by two different applications: "
-	      "~p and ~p", [ModName,A#app.name, " and ", M2#mod.app_name, "."])
+	      "Module ~w potentially included by two different applications: "
+	      "~w and ~w.", [ModName,A#app.name, M2#mod.app_name])
     end;
 mod_recap_dependencies(_S, _A, [], Acc, IsIncl) ->
     {lists:reverse(Acc), IsIncl}.
@@ -939,7 +939,7 @@ verify_config(#state{app_tab=AppTab, sys=#sys{boot_rel = BootRel, rels = Rels}},
 			Rels);
         false ->
 	    reltool_utils:throw_error(
-	      "Release ~p is mandatory (used as boot_rel)",[BootRel])
+	      "Release ~tp is mandatory (used as boot_rel)",[BootRel])
     end.
 
 check_app(AppTab, {RelName, AppName}, Status) ->
@@ -949,7 +949,7 @@ check_app(AppTab, {RelName, AppName}, Status) ->
 	    Status;
 	_ ->
 	    reltool_utils:throw_error(
-	      "Release ~p uses non included application ~p",[RelName,AppName])
+	      "Release ~tp uses non included application ~w",[RelName,AppName])
     end.
 
 check_rel(RelName, RelApps, Status) ->
@@ -960,8 +960,8 @@ check_rel(RelName, RelApps, Status) ->
                         Acc;
                     false ->
 			reltool_utils:throw_error(
-			  "Mandatory application ~p is not included in "
-			  "release ~p", [AppName,RelName])
+			  "Mandatory application ~w is not included in "
+			  "release ~tp", [AppName,RelName])
                 end
         end,
     Mandatory = [kernel, stdlib],
@@ -1015,8 +1015,8 @@ refresh_app(#app{name = AppName,
 			lists:foldl(
 			  fun(M,S) ->
 				  reltool_utils:add_warning(
-				    "Module ~p duplicated in app file for "
-				    "application ~p.", [M, AppName], S)
+				    "Module ~w duplicated in app file for "
+				    "application ~w.", [M, AppName], S)
 			  end,
 			  Status3,
 			  DuplicatedMods)
@@ -1074,18 +1074,18 @@ read_app_info(AppFileOrBin, AppFile, AppName, DefaultVsn, Status) ->
             parse_app_info(AppFile, Info, AI, Status);
         {ok, _BadApp} ->
             {missing_app_info(DefaultVsn),
-	     reltool_utils:add_warning("~p: Illegal contents in app file ~p, "
+	     reltool_utils:add_warning("~w: Illegal contents in app file ~tp, "
 				       "application tuple with arity 3 expected.",
 				       [AppName,AppFile],
 				       Status)};
         {error, Text} when Text =:= EnoentText ->
 	    {missing_app_info(DefaultVsn),
-	     reltool_utils:add_warning("~p: Missing app file ~p.",
+	     reltool_utils:add_warning("~w: Missing app file ~tp.",
 				       [AppName,AppFile],
 				       Status)};
         {error, Text} ->
             {missing_app_info(DefaultVsn),
-	     reltool_utils:add_warning("~p: Cannot parse app file ~p (~p).",
+	     reltool_utils:add_warning("~w: Cannot parse app file ~tp (~tp).",
 				       [AppName,AppFile,Text],
 				       Status)}
     end.
@@ -1122,7 +1122,7 @@ parse_app_info(File, [{Key, Val} | KeyVals], AI, Status) ->
 			   Status);
         _ ->
 	    Status2 =
-		reltool_utils:add_warning("Unexpected item ~p in app file ~p.",
+		reltool_utils:add_warning("Unexpected item ~p in app file ~tp.",
 					  [Key,File],
 					  Status),
 	    parse_app_info(File, KeyVals, AI, Status2)
@@ -1212,7 +1212,7 @@ wait_for_processto_die(Ref, Pid, File) ->
 	{'DOWN', Ref, _Type, _Object, _Info} ->
 	    ok
     after timer:seconds(30) ->
-	    error_logger:error_msg("~p(~p): Waiting for process ~p to die ~p\n",
+	    error_logger:error_msg("~w(~w): Waiting for process ~w to die ~tp\n",
 				   [?MODULE, ?LINE, Pid, File]),
 	    wait_for_processto_die(Ref, Pid, File)
     end.
@@ -1223,7 +1223,7 @@ add_missing_mods(AppName, EbinMods, AppModNames) ->
     [missing_mod(ModName, AppName) || ModName <- MissingModNames].
 
 missing_mod(ModName, AppName) ->
-    %% io:format("Missing: ~p -> ~p\n", [AppName, ModName]),
+    %% io:format("Missing: ~w -> ~w\n", [AppName, ModName]),
     #mod{name = ModName,
          app_name = AppName,
          incl_cond = undefined,
@@ -1323,7 +1323,7 @@ read_config(OldSys, Filename) when is_list(Filename) ->
         {ok, Content} ->
 	    reltool_utils:throw_error("Illegal file content: ~p",[Content]);
         {error, Reason} ->
-	    reltool_utils:throw_error("Illegal config file ~p: ~s",
+	    reltool_utils:throw_error("Illegal config file ~tp: ~ts",
 				      [Filename,file:format_error(Reason)])
     end;
 read_config(OldSys, {sys, KeyVals}) ->
@@ -1341,7 +1341,7 @@ read_config(OldSys, {sys, KeyVals}) ->
 	    NewSys2;
 	false ->
 	    reltool_utils:throw_error(
-	      "Release ~p is mandatory (used as boot_rel)",
+	      "Release ~tp is mandatory (used as boot_rel)",
 	      [NewSys2#sys.boot_rel])
     end;
 read_config(_OldSys, BadConfig) ->
@@ -1510,7 +1510,7 @@ decode(#app{} = App, [{Key, Val} | KeyVals]) ->
 				active_dir = Dir,
 				sorted_dirs = [Dir]};
 		    false ->
-			reltool_utils:throw_error("Illegal lib dir for ~p: ~p",
+			reltool_utils:throw_error("Illegal lib dir for ~w: ~p",
 						  [App#app.name, Val])
 		end;
 	    SelectVsn when SelectVsn=:=vsn; SelectVsn=:=lib_dir ->
@@ -1642,7 +1642,7 @@ patch_erts_version(RootDir, Apps, Status) ->
             end;
         false ->
 	    reltool_utils:throw_error(
-	      "erts cannot be found in the root directory ~p", [RootDir])
+	      "erts cannot be found in the root directory ~tp", [RootDir])
     end.
 
 libs_to_dirs(RootDir, LibDirs) ->
@@ -1669,10 +1669,10 @@ libs_to_dirs(RootDir, LibDirs) ->
 						   lists:prefix("erts", F)],
                     app_dirs2(AllLibDirs, [ErtsFiles]);
                 [Duplicate | _] ->
-		    reltool_utils:throw_error("Duplicate library: ~p",[Duplicate])
+		    reltool_utils:throw_error("Duplicate library: ~tp",[Duplicate])
             end;
         {error, Reason} ->
-	    reltool_utils:throw_error("Missing root library ~p: ~s",
+	    reltool_utils:throw_error("Missing root library ~tp: ~ts",
 				      [RootDir,file:format_error(Reason)])
     end.
 
@@ -1697,7 +1697,7 @@ app_dirs2([Lib | Libs], Acc) ->
             Files2 = lists:zf(Filter, Files),
             app_dirs2(Libs, [Files2 | Acc]);
         {error, Reason} ->
-	    reltool_utils:throw_error("Illegal library ~p: ~s",
+	    reltool_utils:throw_error("Illegal library ~tp: ~ts",
 				      [Lib, file:format_error(Reason)])
     end;
 app_dirs2([], Acc) ->
@@ -1756,7 +1756,7 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
 	    {ok, AF} ->
 		AF;
 	    {error, Reason1} ->
-		reltool_utils:throw_error("Illegal escript ~p: ~p",
+		reltool_utils:throw_error("Illegal escript ~tp: ~p",
 					  [Escript,Reason1])
 	end,
 
@@ -1838,7 +1838,7 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
 				      Status2),
 	    escripts_to_apps(Escripts, Apps2, Status3);
 	{error, Reason2} ->
-	    reltool_utils:throw_error("Illegal escript ~p: ~p",
+	    reltool_utils:throw_error("Illegal escript ~tp: ~p",
 				      [Escript,Reason2])
     end;
 escripts_to_apps([], Apps, Status) ->
@@ -1901,7 +1901,7 @@ init_escript_app(AppName, EscriptAppName, Dir, Info, Mods, Apps, Status) ->
     case lists:keymember(AppName, #app.name, Apps) of
         true ->
 	    reltool_utils:throw_error(
-	      "~p: Application name clash. Escript ~p contains application ~p.",
+	      "~w: Application name clash. Escript ~tp contains application ~tp.",
 	      [AppName,Dir,AppName]);
         false ->
             {App2, Status}
@@ -1986,7 +1986,7 @@ ensure_app_info(#app{is_escript = IsEscript, active_dir = Dir, info = Info},
     %% Escript or application which is inlined in an escript
     {Info, Dir, Status};
 ensure_app_info(#app{name = Name, sorted_dirs = []}, _Status) ->
-    reltool_utils:throw_error("~p: : Missing application directory.",[Name]);
+    reltool_utils:throw_error("~w: : Missing application directory.",[Name]);
 ensure_app_info(#app{name = Name,
 		     vsn = Vsn,
 		     use_selected_vsn = UseSelectedVsn,
@@ -2011,8 +2011,8 @@ ensure_app_info(#app{name = Name,
                 Status2;
             [BadVsn | _] ->
 		reltool_utils:throw_error(
-		  "~p: Application version clash. "
-		  "Multiple directories contains version ~p.",
+		  "~w: Application version clash. "
+		  "Multiple directories contains version ~tp.",
 		  [Name,BadVsn])
         end,
     FirstInfo = hd(AllInfo),
@@ -2034,8 +2034,8 @@ ensure_app_info(#app{name = Name,
 			    {Info, VsnDir, Status3};
 			false ->
 			    reltool_utils:throw_error(
-			      "~p: No application directory contains "
-			      "selected version ~p", [Name,Vsn])
+			      "~w: No application directory contains "
+			      "selected version ~tp", [Name,Vsn])
 		    end
 	    end;
 	true ->