Merge branch 'ks/dialyzer-R15B02-final-fixes/OTP-10231' into maint

* ks/dialyzer-R15B02-final-fixes/OTP-10231:
  Stop a forgotten server process
  Changes to fix warnings identified by running dialyzer -Wunmatched_returns

3 files changed, 161 insertions, 176 deletions

diff --git a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
index 496d317f8a..c237d4e0e9 100644
--- a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
@@ -184,6 +184,7 @@ analysis_start(Parent, Analysis) ->
       false -> Callgraph
     end,
   State3 = analyze_callgraph(NewCallgraph, State2#analysis_state{plt = Plt1}),
+  dialyzer_callgraph:dispose_race_server(NewCallgraph),
   rcv_and_send_ext_types(Parent),
   NonExports = sets:subtract(sets:from_list(AllNodes), Exports),
   NonExportsList = sets:to_list(NonExports),
@@ -519,9 +520,10 @@ rcv_and_send_ext_types(Parent) ->
   Self ! {Self, done},
   case rcv_ext_types(Self, []) of
     [] -> ok;
-    ExtTypes -> Parent ! {Self, ext_types, ExtTypes}
-  end,
-  ok.
+    ExtTypes ->
+      Parent ! {Self, ext_types, ExtTypes},
+      ok
+  end.
 
 rcv_ext_types(Self, ExtTypes) ->
   receive
diff --git a/lib/dialyzer/src/dialyzer_coordinator.erl b/lib/dialyzer/src/dialyzer_coordinator.erl
index 5719132215..28dcf098af 100644
--- a/lib/dialyzer/src/dialyzer_coordinator.erl
+++ b/lib/dialyzer/src/dialyzer_coordinator.erl
@@ -116,7 +116,7 @@ spawn_jobs(Mode, Jobs, InitData, Timing) ->
     fun(Job, Count) ->
 	Pid = dialyzer_worker:launch(Mode, Job, InitData, Coordinator),
 	case TypesigOrDataflow of
-	  true  -> true = ets:insert(SCCtoPID, {Job, Pid});
+	  true  -> true = ets:insert(SCCtoPID, {Job, Pid}), ok;
 	  false -> request_activation(Regulator, Pid)
 	end,
 	Count + 1
@@ -217,7 +217,8 @@ request_activation({_Collector, Regulator, _SCCtoPID}) ->
   wait_activation().
 
 request_activation(Regulator, Pid) ->
-  Regulator ! {req, Pid}.
+  Regulator ! {req, Pid},
+  ok.
 
 spawn_regulator() ->
   InitTickets = dialyzer_utils:parallelism(),
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index b26aa695bd..c6f7c56227 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -192,48 +192,50 @@ create_window(Wx, #options{init_plts = InitPltFiles} = DialyzerOptions) ->
   RunButtons = wxBoxSizer:new(?wxHORIZONTAL),
   Buttons = wxFlexGridSizer:new(3),
   
-  wxSizer:add(ChooseButtons, DeleteButton, ?BorderOpt),
-  wxSizer:add(ChooseButtons, DeleteAllButton, ?BorderOpt),
-  wxSizer:add(ChooseItem, Lab1, Center),
-  wxSizer:add(ChooseItem, ChosenBox, Opts),
-  wxSizer:add(ChooseItem, ChooseButtons, ?BorderOpt),
-  wxSizer:add(FileTypeItem, OptionsLabel),
-  wxSizer:add(FileTypeItem, FileType, [{border, 5}, {flag, ?wxALL}]),
-  wxSizer:add(LogItem, LogLabel, Center),
-  wxSizer:add(LogItem, LogBox, Opts3),
-  wxSizer:add(LogItem, ClearLogButton, ?BorderOpt),
-  wxSizer:add(FileItem, FileLabel),
-  wxSizer:add(FileItem, FilePicker),
-  wxSizer:add(DirItem, DirLabel),
-  wxSizer:add(DirItem, DirPicker),
-  wxSizer:add(AddDirButtons, AddDirButton, ?BorderOpt),
-  wxSizer:add(AddDirButtons, AddRecButton, ?BorderOpt),
-  wxSizer:add(FileDirItem, FileItem),
-  wxSizer:add(FileDirItem, AddButton, ?BorderOpt),
-  wxSizer:add(FileDirItem, DirItem, ?BorderOpt),
-  wxSizer:add(FileDirItem, AddDirButtons, ?BorderOpt),
-  wxSizer:add(WarnButtons, ExplainWarnButton, ?BorderOpt),
-  wxSizer:add(WarnButtons, ClearWarningsButton, ?BorderOpt),
-  wxSizer:add(RunButtons, RunButton, ?BorderOpt),
-  wxSizer:add(RunButtons, StopButton, ?BorderOpt),
-  wxSizer:add(Buttons, WarnButtons),
-  wxSizer:add(Buttons, wxStaticText:new(Frame, ?LABEL7, ""), [{flag, ?wxEXPAND}]),
-  wxSizer:add(Buttons, RunButtons),
-  wxFlexGridSizer:addGrowableCol(Buttons, 1),
-  wxSizer:add(WarningsItem, WarningsLabel, Center),
-  wxSizer:add(WarningsItem, WarningsBox, Opts3),
-  wxSizer:add(WarningsItem, Buttons, [{flag, ?wxEXPAND bor ?wxALL},?Border]),
- 
-  wxSizer:add(Left, ChooseItem, Opts),
-  wxSizer:add(Left, FileDirItem, [{proportion, 1}, {border, 60}, {flag, ?wxTOP}]),
-  wxSizer:add(RightUp, FileTypeItem, ?BorderOpt),
-  wxSizer:add(RightUp, LogItem, Opts3),
-  wxSizer:add(Right, RightUp, Opts3),
-  wxSizer:add(Right, WarningsItem, Opts3),
-  wxSizer:add(Top, Left, Opts),
-  wxSizer:add(Top, Right, Opts3),
-
-  wxSizer:add(All, Top, Opts),
+  _ = wxSizer:add(ChooseButtons, DeleteButton, ?BorderOpt),
+  _ = wxSizer:add(ChooseButtons, DeleteAllButton, ?BorderOpt),
+  _ = wxSizer:add(ChooseItem, Lab1, Center),
+  _ = wxSizer:add(ChooseItem, ChosenBox, Opts),
+  _ = wxSizer:add(ChooseItem, ChooseButtons, ?BorderOpt),
+  _ = wxSizer:add(FileTypeItem, OptionsLabel),
+  _ = wxSizer:add(FileTypeItem, FileType, [{border, 5}, {flag, ?wxALL}]),
+  _ = wxSizer:add(LogItem, LogLabel, Center),
+  _ = wxSizer:add(LogItem, LogBox, Opts3),
+  _ = wxSizer:add(LogItem, ClearLogButton, ?BorderOpt),
+  _ = wxSizer:add(FileItem, FileLabel),
+  _ = wxSizer:add(FileItem, FilePicker),
+  _ = wxSizer:add(DirItem, DirLabel),
+  _ = wxSizer:add(DirItem, DirPicker),
+  _ = wxSizer:add(AddDirButtons, AddDirButton, ?BorderOpt),
+  _ = wxSizer:add(AddDirButtons, AddRecButton, ?BorderOpt),
+  _ = wxSizer:add(FileDirItem, FileItem),
+  _ = wxSizer:add(FileDirItem, AddButton, ?BorderOpt),
+  _ = wxSizer:add(FileDirItem, DirItem, ?BorderOpt),
+  _ = wxSizer:add(FileDirItem, AddDirButtons, ?BorderOpt),
+  _ = wxSizer:add(WarnButtons, ExplainWarnButton, ?BorderOpt),
+  _ = wxSizer:add(WarnButtons, ClearWarningsButton, ?BorderOpt),
+  _ = wxSizer:add(RunButtons, RunButton, ?BorderOpt),
+  _ = wxSizer:add(RunButtons, StopButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons, WarnButtons),
+  _ = wxSizer:add(Buttons, wxStaticText:new(Frame, ?LABEL7, ""),
+		  [{flag, ?wxEXPAND}]),
+  _ = wxSizer:add(Buttons, RunButtons),
+  _ = wxFlexGridSizer:addGrowableCol(Buttons, 1),
+  _ = wxSizer:add(WarningsItem, WarningsLabel, Center),
+  _ = wxSizer:add(WarningsItem, WarningsBox, Opts3),
+  _ = wxSizer:add(WarningsItem, Buttons,
+		  [{flag, ?wxEXPAND bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Left, ChooseItem, Opts),
+  _ = wxSizer:add(Left, FileDirItem,
+		  [{proportion, 1}, {border, 60}, {flag, ?wxTOP}]),
+  _ = wxSizer:add(RightUp, FileTypeItem, ?BorderOpt),
+  _ = wxSizer:add(RightUp, LogItem, Opts3),
+  _ = wxSizer:add(Right, RightUp, Opts3),
+  _ = wxSizer:add(Right, WarningsItem, Opts3),
+  _ = wxSizer:add(Top, Left, Opts),
+  _ = wxSizer:add(Top, Right, Opts3),
+
+  _ = wxSizer:add(All, Top, Opts),
   wxWindow:setSizer(Frame, All),
   wxWindow:setSizeHints(Frame, {1150,600}),
   wxWindow:show(Frame),
@@ -294,91 +296,67 @@ create_window(Wx, #options{init_plts = InitPltFiles} = DialyzerOptions) ->
 
 createFileMenu() ->
   FileMenu = wxMenu:new(),
-  wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_SAVE_WARNINGS},
-					  {text, "Save &Warnings"}])),
-  wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_SAVE_LOG},
-					  {text, "Save &Log"}])),
-  wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_QUIT},
-					  {text, "E&xit\tAlt-X"}])),
+  _ = wxMenu:append(FileMenu, wxMenuItem:new([{id, ?menuID_FILE_SAVE_WARNINGS},
+					      {text, "Save &Warnings"}])),
+  _ = wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_SAVE_LOG},
+					      {text, "Save &Log"}])),
+  _ = wxMenu:append(FileMenu, wxMenuItem:new([{id,   ?menuID_FILE_QUIT},
+					      {text, "E&xit\tAlt-X"}])),
   FileMenu.
 
 createWarningsMenu() ->
   WarningsMenu = wxMenu:new(),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_MATCH_FAILURES,
-			 "Match failures"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_MATCH_FAILURES, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_FAIL_FUN_CALLS,
-			 "Failing function calls"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_FAIL_FUN_CALLS, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_BAD_FUN,
-			 "Bad fun applications"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_BAD_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_OPAQUE,
-			 "Opaqueness violations"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_OPAQUE, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_LIST_CONSTR,
-			 "Improper list constructions"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_LIST_CONSTR, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_UNUSED_FUN,
-			 "Unused functions"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_UNUSED_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_ERROR_HANDLING_FUN,
-			 "Error handling functions"),
-  wxMenu:appendCheckItem(WarningsMenu, 
-			 ?menuID_WARN_NO_RETURN_FUN,
-			 "Functions of no return"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_NO_RETURN_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_UNEXPORTED_FUN,
-			 "Call to unexported function"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_UNEXPORTED_FUN, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_RACE_CONDITIONS,
-			 "Possible race conditions"),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_WRONG_CONTRACTS,
-			 "Wrong contracts"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_WRONG_CONTRACTS, true),
-  wxMenu:appendCheckItem(WarningsMenu,
-			 ?menuID_WARN_CONTRACT_SYNTAX,
-			 "Wrong contract syntax"),
-  wxMenu:check(WarningsMenu, ?menuID_WARN_CONTRACT_SYNTAX, true),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_MATCH_FAILURES, "Match failures"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_FAIL_FUN_CALLS,
+		 "Failing function calls"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_BAD_FUN, "Bad fun applications"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_OPAQUE, "Opaqueness violations"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_LIST_CONSTR,
+		 "Improper list constructions"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_UNUSED_FUN, "Unused functions"),
+  _ = wxMenu:appendCheckItem(WarningsMenu, ?menuID_WARN_ERROR_HANDLING_FUN,
+			     "Error handling functions"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_NO_RETURN_FUN,
+		 "Functions of no return"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_UNEXPORTED_FUN,
+		 "Call to unexported function"),
+  _ = wxMenu:appendCheckItem(WarningsMenu, ?menuID_WARN_RACE_CONDITIONS,
+			     "Possible race conditions"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_WRONG_CONTRACTS, "Wrong contracts"),
+  addCheckedItem(WarningsMenu, ?menuID_WARN_CONTRACT_SYNTAX,
+		 "Wrong contract syntax"),
   WarningsMenu.
 
+addCheckedItem(Menu, ItemId, Str) ->
+  _ = wxMenu:appendCheckItem(Menu, ItemId, Str), 
+  wxMenu:check(Menu, ItemId, true).
+
 createPltMenu() ->
   PltMenu = wxMenu:new(),
-  wxMenu:appendCheckItem(PltMenu, 
-			 ?menuID_PLT_INIT_EMPTY,
-			 "Init with empty PLT"),
-  wxMenu:append(PltMenu, wxMenuItem:new([{id,   ?menuID_PLT_SHOW_CONTENTS},
-					 {text, "Show contents"}])),
-  wxMenu:append(PltMenu, wxMenuItem:new([{id,   ?menuID_PLT_SEARCH_CONTENTS},
-					 {text, "Search contents"}])),
+  _ = wxMenu:appendCheckItem(PltMenu, ?menuID_PLT_INIT_EMPTY,
+			     "Init with empty PLT"),
+  _ = wxMenu:append(PltMenu, wxMenuItem:new([{id, ?menuID_PLT_SHOW_CONTENTS},
+					     {text, "Show contents"}])),
+  _ = wxMenu:append(PltMenu, wxMenuItem:new([{id, ?menuID_PLT_SEARCH_CONTENTS},
+					     {text, "Search contents"}])),
   PltMenu.
 
 createOptionsMenu() ->
   OptsMenu  = wxMenu:new(),
-  wxMenu:append(OptsMenu, wxMenuItem:new([{id,   ?menuID_OPTIONS_MACRO},
-					  {text, "Manage Macro Definitions"}])),
-  wxMenu:append(OptsMenu, wxMenuItem:new([{id,   ?menuID_OPTIONS_INCLUDE_DIR},
-					  {text, "Manage Include Directories"}])),
+  _ = wxMenu:append(OptsMenu, wxMenuItem:new([{id, ?menuID_OPTIONS_MACRO},
+					      {text, "Manage Macro Definitions"}])),
+  _ = wxMenu:append(OptsMenu, wxMenuItem:new([{id, ?menuID_OPTIONS_INCLUDE_DIR},
+					      {text, "Manage Include Directories"}])),
   OptsMenu.
 
 createHelpMenu() ->
   HelpMenu = wxMenu:new(),
-  wxMenu:append(HelpMenu, wxMenuItem:new([{id,   ?menuID_HELP_MANUAL},
-					  {text, "Manual"}])),
-  wxMenu:append(HelpMenu, wxMenuItem:new([{id,   ?menuID_HELP_WARNING_OPTIONS},
-					  {text, "Warning Options"}])),
-  wxMenu:append(HelpMenu, wxMenuItem:new([{id,   ?menuID_HELP_ABOUT},
-					  {text, "About"}])),
+  _ = wxMenu:append(HelpMenu, wxMenuItem:new([{id, ?menuID_HELP_MANUAL},
+					      {text, "Manual"}])),
+  _ = wxMenu:append(HelpMenu, wxMenuItem:new([{id, ?menuID_HELP_WARNING_OPTIONS},
+					      {text, "Warning Options"}])),
+  _ = wxMenu:append(HelpMenu, wxMenuItem:new([{id, ?menuID_HELP_ABOUT},
+					      {text, "About"}])),
   HelpMenu.
 
 %% ----------------------------------------------------------------
@@ -583,20 +561,20 @@ search_doc_plt(#gui_state{gui = Wx} = State) ->
   ArLayout = wxBoxSizer:new(?wxVERTICAL),
   Buttons = wxBoxSizer:new(?wxHORIZONTAL),
 
-  wxSizer:add(ModLayout, ModLabel, ?BorderOpt),
-  wxSizer:add(ModLayout,ModText, ?BorderOpt),
-  wxSizer:add(FunLayout, FunLabel, ?BorderOpt),
-  wxSizer:add(FunLayout,FunText, ?BorderOpt),
-  wxSizer:add(ArLayout, ArLabel, ?BorderOpt),
-  wxSizer:add(ArLayout,ArText, ?BorderOpt),
-  wxSizer:add(Buttons, SearchButton, ?BorderOpt),
-  wxSizer:add(Buttons,Cancel, ?BorderOpt),
-
-  wxSizer:add(Top, ModLayout),
-  wxSizer:add(Top, FunLayout),
-  wxSizer:add(Top, ArLayout),
-  wxSizer:add(Layout, Top,[{flag, ?wxALIGN_CENTER}]),
-  wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER bor ?wxBOTTOM}]),
+  _ = wxSizer:add(ModLayout, ModLabel, ?BorderOpt),
+  _ = wxSizer:add(ModLayout, ModText, ?BorderOpt),
+  _ = wxSizer:add(FunLayout, FunLabel, ?BorderOpt),
+  _ = wxSizer:add(FunLayout,FunText, ?BorderOpt),
+  _ = wxSizer:add(ArLayout, ArLabel, ?BorderOpt),
+  _ = wxSizer:add(ArLayout,ArText, ?BorderOpt),
+  _ = wxSizer:add(Buttons, SearchButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons,Cancel, ?BorderOpt),
+
+  _ = wxSizer:add(Top, ModLayout),
+  _ = wxSizer:add(Top, FunLayout),
+  _ = wxSizer:add(Top, ArLayout),
+  _ = wxSizer:add(Layout, Top,[{flag, ?wxALIGN_CENTER}]),
+  _ = wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER bor ?wxBOTTOM}]),
   wxFrame:connect(Dialog, close_window),
   wxWindow:setSizer(Dialog, Layout),
   wxFrame:show(Dialog),
@@ -654,14 +632,15 @@ error_sms(State, Message) ->
   output_sms(State, ?DIALYZER_ERROR_TITLE, Message, error).
 
 output_sms(#gui_state{frame = Frame}, Title, Message, Type) ->
-  case Type of
-    error ->
-      MessageWin = wxMessageDialog:new(Frame,Message,[{caption, Title},{style, ?wxOK bor ?wxICON_ERROR}]);
-    info ->
-       MessageWin = wxMessageDialog:new(Frame,Message,[{caption, Title},{style, ?wxOK bor ?wxICON_INFORMATION}])
-  end,
+  Style = case Type of
+	    error -> ?wxOK bor ?wxICON_ERROR;
+	    info  -> ?wxOK bor ?wxICON_INFORMATION
+	  end,
+  Options = [{caption, Title}, {style, Style}],
+  MessageWin = wxMessageDialog:new(Frame, Message, Options),
   wxWindow:setSizeHints(MessageWin, {350,100}),
-  wxDialog:showModal(MessageWin).
+  wxDialog:showModal(MessageWin),
+  ok.
 
 free_editor(#gui_state{gui = Wx, frame = Frame}, Title, Contents0) ->
   Contents = lists:flatten(Contents0),
@@ -685,8 +664,9 @@ free_editor(#gui_state{gui = Wx, frame = Frame}, Title, Contents0) ->
   wxButton:connect(Ok, command_button_clicked),
   Layout = wxBoxSizer:new(?wxVERTICAL),
   
-  wxSizer:add(Layout, Editor, ?BorderOpt),
-  wxSizer:add(Layout, Ok, [{flag, ?wxALIGN_CENTER bor ?wxBOTTOM bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Layout, Editor, ?BorderOpt),
+  Flag = ?wxALIGN_CENTER bor ?wxBOTTOM bor ?wxALL,
+  _ = wxSizer:add(Layout, Ok, [{flag, Flag}, ?Border]),
   wxWindow:setSizer(Win, Layout),
   wxWindow:show(Win),
   show_info_loop(Frame, Win).
@@ -696,7 +676,7 @@ show_info_loop(Frame, Win) ->
     #wx{id = ?Message_Ok, event = #wxCommand{type = command_button_clicked}} ->
       wxWindow:destroy(Win);
     #wx{id = ?Message, event = #wxClose{type = close_window}} ->
-       wxWindow:destroy(Win);
+      wxWindow:destroy(Win);
     #wx{event = #wxClose{type = close_window}} ->
       wxWindow:destroy(Frame)
   end.
@@ -921,13 +901,14 @@ save_file(#gui_state{frame = Frame, warnings_box = WBox, log = Log} = State, Typ
 				     {message, Message},
 				     {style,?wxFD_SAVE bor ?wxFD_OVERWRITE_PROMPT}]),
       case wxFileDialog:showModal(FileDialog) of
-	?wxID_OK -> Path = wxFileDialog:getPath(FileDialog),
-		    case wxTextCtrl:saveFile(Box,[{file,Path}]) of
-		      true -> ok;
-		      false -> error_sms(State,"Could not write to file:\n" ++ Path)
-		    end;
+	?wxID_OK ->
+	  Path = wxFileDialog:getPath(FileDialog),
+	  case wxTextCtrl:saveFile(Box,[{file,Path}]) of
+	    true -> ok;
+	    false -> error_sms(State, "Could not write to file:\n" ++ Path)
+	  end;
 	?wxID_CANCEL -> wxWindow:destroy(FileDialog);
-	_ -> error_sms(State,"Could not write to file:\n")
+	_ -> error_sms(State, "Could not write to file:\n")
       end
   end.
 					
@@ -961,16 +942,16 @@ include_dialog(#gui_state{gui = Wx, frame = Frame, options = Options}) ->
   Buttons = wxBoxSizer:new(?wxHORIZONTAL),
   Buttons1 = wxBoxSizer:new(?wxHORIZONTAL),
 
-  wxSizer:add(Layout, DirLabel, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Layout, DirPicker, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Layout,AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Layout,Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
-  wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
-  wxSizer:add(Layout,Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Buttons1, Ok, ?BorderOpt),
-  wxSizer:add(Buttons1,Cancel, ?BorderOpt),
-  wxSizer:add(Layout,Buttons1,[{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
+  _ = wxSizer:add(Layout, DirLabel, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Layout, DirPicker, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Layout,AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Layout,Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
+  _ = wxSizer:add(Layout,Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Buttons1, Ok, ?BorderOpt),
+  _ = wxSizer:add(Buttons1,Cancel, ?BorderOpt),
+  _ = wxSizer:add(Layout,Buttons1,[{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
 
   wxFrame:connect(Dialog, close_window),
   wxWindow:setSizer(Dialog, Layout),
@@ -1058,21 +1039,21 @@ macro_dialog(#gui_state{gui = Wx, frame = Frame, options = Options}) ->
   Buttons = wxBoxSizer:new(?wxHORIZONTAL),
   Buttons1 = wxBoxSizer:new(?wxHORIZONTAL),
 
-  wxSizer:add(MacroItem, MacroLabel, ?BorderOpt),
-  wxSizer:add(MacroItem, MacroText, ?BorderOpt),
-  wxSizer:add(TermItem, TermLabel, ?BorderOpt),
-  wxSizer:add(TermItem, TermText, ?BorderOpt),
-  wxSizer:add(Item, MacroItem),
-  wxSizer:add(Item, TermItem),
-  wxSizer:add(Layout, Item, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Layout, AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Layout, Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-  wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
-  wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
-  wxSizer:add(Layout, Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
-  wxSizer:add(Buttons1, Ok, ?BorderOpt),
-  wxSizer:add(Buttons1, Cancel, ?BorderOpt),
-  wxSizer:add(Layout, Buttons1, [{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
+  _ = wxSizer:add(MacroItem, MacroLabel, ?BorderOpt),
+  _ = wxSizer:add(MacroItem, MacroText, ?BorderOpt),
+  _ = wxSizer:add(TermItem, TermLabel, ?BorderOpt),
+  _ = wxSizer:add(TermItem, TermText, ?BorderOpt),
+  _ = wxSizer:add(Item, MacroItem),
+  _ = wxSizer:add(Item, TermItem),
+  _ = wxSizer:add(Layout, Item, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Layout, AddButton, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Layout, Box, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+  _ = wxSizer:add(Buttons, DeleteButton, ?BorderOpt),
+  _ = wxSizer:add(Buttons, DeleteAllButton, ?BorderOpt),
+  _ = wxSizer:add(Layout, Buttons, [{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+  _ = wxSizer:add(Buttons1, Ok, ?BorderOpt),
+  _ = wxSizer:add(Buttons1, Cancel, ?BorderOpt),
+  _ = wxSizer:add(Layout, Buttons1, [{flag, ?wxALIGN_RIGHT bor ?wxBOTTOM}]),
 
   wxFrame:connect(Dialog, close_window),
   wxWindow:setSizer(Dialog, Layout),
@@ -1216,13 +1197,14 @@ show_explanation(#gui_state{gui = Wx} = State, Explanation) ->
       wxButton:connect(Ok, command_button_clicked),
       Layout = wxBoxSizer:new(?wxVERTICAL),
       Buttons = wxBoxSizer:new(?wxHORIZONTAL),
-      wxSizer:add(Buttons, ExplButton, ?BorderOpt),
-      wxSizer:add(Buttons, Ok, ?BorderOpt),
-      wxSizer:add(Layout, Editor,[{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
-      wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
+      _ = wxSizer:add(Buttons, ExplButton, ?BorderOpt),
+      _ = wxSizer:add(Buttons, Ok, ?BorderOpt),
+      _ = wxSizer:add(Layout, Editor, [{flag, ?wxALIGN_CENTER_HORIZONTAL bor ?wxALL}, ?Border]),
+      _ = wxSizer:add(Layout, Buttons,[{flag, ?wxALIGN_CENTER_HORIZONTAL}]),
       wxWindow:setSizer(Win, Layout),
       wxWindow:show(Win),
-      show_explanation_loop(State#gui_state{explanation_box = Editor}, Win, Explanation)
+      NewState = State#gui_state{explanation_box = Editor},
+      show_explanation_loop(NewState, Win, Explanation)
   end.
   
 show_explanation_loop(#gui_state{frame = Frame, expl_pid = ExplPid} = State, Win, Explanation) ->