Merge branch 'zandra/debugger/unmatched_returns/OTP-13345'

* zandra/debugger/unmatched_returns/OTP-13345:
  dbg_wx* - fix remaining unmached_return warnings
  dbg_wx_* - fix unmatched return warnings
  int - fix unmatched_return warnings
  i - fix unmatched_return warnings
  dbg_debugged - fix unmatched_return warnings
  dbg_iserver - fix unmatched_return warnings

15 files changed, 116 insertions, 106 deletions

diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index 5b1469a10e..e142af4ae0 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -70,7 +70,10 @@ msg_loop(Meta, Mref, SaveStacktrace) ->
 	%% Meta is evaluating a receive, must be done within context
 	%% of real (=this) process
 	{sys, Meta, {'receive',Msg}} ->
-	    receive Msg -> Meta ! {self(), rec_acked} end,
+	    receive Msg ->
+		Meta ! {self(), rec_acked},
+		ok
+	    end,
 	    msg_loop(Meta, Mref, SaveStacktrace);
 
 	%% Meta needs something evaluated within context of real process
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index 1b274e20ae..57a3719a50 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -171,10 +171,10 @@ handle_cmd(Bs, Status, Ieval) ->
 %% User control of process execution and settings
 %%====================================================================
 
-step(Meta) ->     Meta ! {user, {cmd, step}}.
-next(Meta) ->     Meta ! {user, {cmd, next}}.
-continue(Meta) -> Meta ! {user, {cmd, continue}}.
-finish(Meta) ->   Meta ! {user, {cmd, finish}}.
+step(Meta) ->     Meta ! {user, {cmd, step}}, ok.
+next(Meta) ->     Meta ! {user, {cmd, next}}, ok.
+continue(Meta) -> Meta ! {user, {cmd, continue}}, ok.
+finish(Meta) ->   Meta ! {user, {cmd, finish}}, ok.
 skip(Meta) ->     Meta ! {user, {cmd, skip}}.
 
 timeout(Meta) ->  Meta ! {user, timeout}.
diff --git a/lib/debugger/src/dbg_iserver.erl b/lib/debugger/src/dbg_iserver.erl
index 0ad303d8d9..3561454685 100644
--- a/lib/debugger/src/dbg_iserver.erl
+++ b/lib/debugger/src/dbg_iserver.erl
@@ -72,17 +72,17 @@ cast(Int, Request) ->
     gen_server:cast(Int, Request).
 
 safe_call(Request) ->
-    ensure_started(),
+    {ok, _} = ensure_started(),
     call(Request).
 
 safe_cast(Request) ->
-    ensure_started(),
+    {ok, _} = ensure_started(),
     cast(Request).
 
 ensure_started() ->
     case whereis(?MODULE) of
 	undefined -> start();
-	_Pid -> ignore
+	Pid -> {ok, Pid}
     end.
 
 %%--Module database---------------------------------------------------
@@ -402,8 +402,10 @@ handle_cast({set_status, Meta, Status, Info}, State) ->
     send_all(subscriber, {new_status, Proc#proc.pid, Status, Info}, State),
     if
 	Status =:= break ->
-	    auto_attach(break, State#state.auto, Proc);
-	true -> ignore
+	    _ = auto_attach(break, State#state.auto, Proc),
+	    ok;
+	true ->
+	    ok
     end,
     Proc2 = Proc#proc{status=Status, info=Info},
     {noreply, State#state{procs=lists:keyreplace(Meta, #proc.meta,
@@ -470,7 +472,7 @@ handle_info({'EXIT',Who,Why}, State) ->
 				      [self(),AttPid,Pid,Why,ExitInfo]);
 		       undefined ->
 			   %% Otherwise, auto attach if necessary
-			   auto_attach(exit, State#state.auto, Pid),
+			   _ = auto_attach(exit, State#state.auto, Pid),
 			   Who
 		   end,
 	    send_all(subscriber, {new_status,Pid,exit,Why}, State),
@@ -583,7 +585,8 @@ send_all(Pids, Msg) ->
     lists:foreach(fun(Pid) -> send(Pid, Msg) end, Pids).
 
 send(Pid, Msg) ->
-    Pid ! {int, Msg}.
+    Pid ! {int, Msg},
+    ok.
 
 get_proc({Type, Pid}, Procs) ->
     Index = case Type of
diff --git a/lib/debugger/src/dbg_wx_break_win.erl b/lib/debugger/src/dbg_wx_break_win.erl
index cd1e81456f..770681510d 100644
--- a/lib/debugger/src/dbg_wx_break_win.erl
+++ b/lib/debugger/src/dbg_wx_break_win.erl
@@ -65,18 +65,18 @@ create_win(Parent, Pos, function, Mod, _Line) ->
 			    {choices, IntStrs}]),
     
     Expand = [{border, 5}, {flag,?wxLEFT bor ?wxRIGHT bor ?wxEXPAND}],
-    wxSizer:add(MainS, Label, [{border,5},
+    _ = wxSizer:add(MainS, Label, [{border,5},
 			       {flag,?wxTOP bor ?wxLEFT bor ?wxRIGHT}]),
-    wxSizer:add(MainS, Text, Expand),
+    _ = wxSizer:add(MainS, Text, Expand),
     FunLabel = wxStaticText:new(Win, ?wxID_ANY, "Function:"),
     LB = wxListBox:new(Win, ?wxID_ANY, [{size,{-1, 100}},{style,?wxLB_MULTIPLE}]),
-    wxSizer:add(MainS, FunLabel, Expand),
-    wxSizer:add(MainS, LB, [{proportion,1}|Expand]),
+    _ = wxSizer:add(MainS, FunLabel, Expand),
+    _ = wxSizer:add(MainS, LB, [{proportion,1}|Expand]),
     wxSizer:setMinSize(MainS, 300, 400),
     OK = wxDialog:createStdDialogButtonSizer(Win, ?wxOK bor ?wxCANCEL),
-    wxSizer:add(MainS, OK, [{border,5},{flag,?wxALL}]),
+    _ = wxSizer:add(MainS, OK, [{border,5},{flag,?wxALL}]),
     wxDialog:setSizer(Win,MainS),
-    wxSizer:fit(MainS, Win),
+    _ = wxSizer:fit(MainS, Win),
     wxSizer:setSizeHints(MainS,Win),
     wxComboBox:setFocus(Text),
     wxDialog:connect(Win,    command_button_clicked),
@@ -110,11 +110,11 @@ create_win(Parent, Pos, Type, Mod, Line) ->
     IntStrs = [atom_to_list(M) || M <- Int],
     ModT  = wxComboBox:new(Win, ?wxID_ANY, [{choices,IntStrs}]),
     ModSz = create_label_of_control(Win, "Module:", ModT, Mod),
-    wxSizer:add(MainS,ModSz,[{flag, ?wxEXPAND}]),
+    _ = wxSizer:add(MainS,ModSz,[{flag, ?wxEXPAND}]),
     %% Create rest of text input fields
     Add = fun({IType, Label, Def}) ->
 		  {Sz, Text} = create_sizer_with_text(Win, Label, Def),
-		  wxSizer:add(MainS, Sz, [{flag, ?wxEXPAND}]),
+		  _ = wxSizer:add(MainS, Sz, [{flag, ?wxEXPAND}]),
 		  {Text, IType}
 	  end,
     Inputs = case Type of
@@ -129,15 +129,15 @@ create_win(Parent, Pos, Type, Mod, Line) ->
     Entries = wx:map(Add, Inputs),    
     %% Create and add radio box
     {TriggerBox,Trigger} = create_trigger_box(Win),
-    wxSizer:add(MainS, TriggerBox, [{border,5},{flag,?wxALL bor ?wxEXPAND}]),
+    _ = wxSizer:add(MainS, TriggerBox, [{border,5},{flag,?wxALL bor ?wxEXPAND}]),
 
-    wxSizer:addStretchSpacer(MainS),
+    _ = wxSizer:addStretchSpacer(MainS),
     %% Put it together
     OK = wxDialog:createStdDialogButtonSizer(Win, ?wxOK bor ?wxCANCEL),
-    wxSizer:add(MainS, OK, [{border,5},{flag,?wxALL}]),
+    _ = wxSizer:add(MainS, OK, [{border,5},{flag,?wxALL}]),
     wxSizer:setMinSize(MainS, 300, -1),
     wxDialog:setSizer(Win,MainS),
-    wxSizer:fit(MainS, Win),
+    _ = wxSizer:fit(MainS, Win),
     wxSizer:setSizeHints(MainS,Win),
     wxComboBox:setFocus(ModT),
     wxDialog:connect(Win, command_button_clicked),
@@ -243,8 +243,8 @@ create_label_of_control(Parent, Label, Control, Def) ->
     Text  = wxStaticText:new(Parent, ?wxID_ANY, Label),
     Border = {border, 5},
     Flag   = ?wxRIGHT bor ?wxLEFT bor ?wxALIGN_CENTRE_VERTICAL,
-    wxSizer:add(Sizer, Text, [{proportion,1}, {flag,Flag}, Border]),
-    wxSizer:add(Sizer, Control, [{proportion,3}, {flag,Flag bor ?wxEXPAND}, Border]),
+    _ = wxSizer:add(Sizer, Text, [{proportion,1}, {flag,Flag}, Border]),
+    _ = wxSizer:add(Sizer, Control, [{proportion,3}, {flag,Flag bor ?wxEXPAND}, Border]),
     wxControl:setLabel(Control, dbg_wx_win:to_string(Def)),
     Sizer.
     
@@ -252,11 +252,11 @@ create_trigger_box(Win) ->
     SBox = wxStaticBox:new(Win, ?wxID_ANY, "Trigger Action:"),
     SBS  = wxStaticBoxSizer:new(SBox, ?wxVERTICAL),
     Ebtn = wxRadioButton:new(Win, ?wxID_ANY, "Enable"),
-    wxSizer:add(SBS,Ebtn),
+    _ = wxSizer:add(SBS,Ebtn),
     Dibtn = wxRadioButton:new(Win, ?wxID_ANY, "Disable"),
-    wxSizer:add(SBS,Dibtn),
+    _ = wxSizer:add(SBS,Dibtn),
     Debtn = wxRadioButton:new(Win, ?wxID_ANY, "Delete"),
-    wxSizer:add(SBS,Debtn),
+    _ = wxSizer:add(SBS,Debtn),
     wxRadioButton:setValue(Ebtn, true),
     {SBS, [{Ebtn,enable},{Dibtn,disable},{Debtn,delete}]}.
 
diff --git a/lib/debugger/src/dbg_wx_code.erl b/lib/debugger/src/dbg_wx_code.erl
index f8fc331a81..473963500a 100644
--- a/lib/debugger/src/dbg_wx_code.erl
+++ b/lib/debugger/src/dbg_wx_code.erl
@@ -127,20 +127,22 @@ load_code(Ed, Code) ->
     %%io:format("~p ~p ~p~n", [Lines, Sz, LW]),
     ?stc:setMarginWidth(Ed, 0, LW+5),
     ?stc:setReadOnly(Ed, true),
-    Ed.
+    ok.
 
 unload_code(Ed) ->
     ?stc:setReadOnly(Ed, false),
     ?stc:setTextRaw(Ed, <<0:8>>),
     ?stc:setReadOnly(Ed, true),
-    Ed.
+    ok.
 
 add_break_to_code(Ed, Line, active) ->
     ?stc:markerDelete(Ed, Line-1, 1),
-    ?stc:markerAdd(Ed, Line-1, 0);
+    ?stc:markerAdd(Ed, Line-1, 0),
+    ok;
 add_break_to_code(Ed, Line, inactive) ->
     ?stc:markerDelete(Ed, Line-1, 0),
-    ?stc:markerAdd(Ed, Line-1, 1).
+    ?stc:markerAdd(Ed, Line-1, 1),
+    ok.
 
 del_break_from_code(Ed,Line) ->
     ?stc:markerDelete(Ed, Line-1, 0),
diff --git a/lib/debugger/src/dbg_wx_filedialog_win.erl b/lib/debugger/src/dbg_wx_filedialog_win.erl
index 2103536a04..f7b031dc28 100644
--- a/lib/debugger/src/dbg_wx_filedialog_win.erl
+++ b/lib/debugger/src/dbg_wx_filedialog_win.erl
@@ -118,9 +118,9 @@ init([Parent, Id, Options0]) ->
     wxTextCtrl:connect(Dir, char, [{callback, IsTab}]),
 
     Top  = wxBoxSizer:new(?wxHORIZONTAL),
-    wxSizer:add(Top, Back, [{border, 2},{flag,?wxALL bor ?wxEXPAND}]),
-    wxSizer:add(Top, Forw, [{border, 2},{flag,?wxALL bor ?wxEXPAND}]),
-    wxSizer:add(Top, Up,   [{border, 2},{flag,?wxALL bor ?wxEXPAND}]),    
+    _ = wxSizer:add(Top, Back, [{border, 2},{flag,?wxALL bor ?wxEXPAND}]),
+    _ = wxSizer:add(Top, Forw, [{border, 2},{flag,?wxALL bor ?wxEXPAND}]),
+    _ = wxSizer:add(Top, Up,   [{border, 2},{flag,?wxALL bor ?wxEXPAND}]),    
 
     %% List Ctrl
     {Art, IconMap} = create_icons(ExtraIcons),
@@ -154,13 +154,13 @@ init([Parent, Id, Options0]) ->
     
     %% OK done
     Box  = wxBoxSizer:new(?wxVERTICAL),
-    wxSizer:add(Box, Top,  [{border, 2}, {flag,?wxALL bor ?wxEXPAND}]),
-    wxSizer:add(Box, Dir,  [{border, 2}, {flag,?wxALL bor ?wxEXPAND}]),
-    wxSizer:add(Box, LC,   [{border, 2}, {flag,?wxALL bor ?wxEXPAND}, {proportion, 1}]),
-    wxSizer:add(Box, Bott, [{border, 2}, {flag,?wxALL bor ?wxEXPAND}]),
+    _ = wxSizer:add(Box, Top,  [{border, 2}, {flag,?wxALL bor ?wxEXPAND}]),
+    _ = wxSizer:add(Box, Dir,  [{border, 2}, {flag,?wxALL bor ?wxEXPAND}]),
+    _ = wxSizer:add(Box, LC,   [{border, 2}, {flag,?wxALL bor ?wxEXPAND}, {proportion, 1}]),
+    _ = wxSizer:add(Box, Bott, [{border, 2}, {flag,?wxALL bor ?wxEXPAND}]),
     
     wxWindow:setSizer(Dlg, Box),
-    wxSizer:fit(Box, Dlg),
+    _ = wxSizer:fit(Box, Dlg),
     wxSizer:setSizeHints(Box,Dlg),
     State = #state{win=Dlg, 
 		   back=Back, forward=Forw, up=Up,
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index 345367a911..a32a6894b8 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -135,7 +135,7 @@ init2(CallingPid, Mode, SFile, GS) ->
 
     %% Start other necessary stuff
     dbg_wx_win:init(),     
-    dbg_wx_winman:start(), % Debugger window manager
+    _ = dbg_wx_winman:start(), % Debugger window manager
 
     %% Create monitor window
     Title = "Monitor",
@@ -339,7 +339,7 @@ gui_cmd('Delete All Modules', State) ->
     lists:foreach(fun(Mod) -> int:nn(Mod) end, int:interpreted()),
     State;
 gui_cmd({module, Mod, What}, State) ->
-    case What of
+    _ = case What of
 	delete -> int:nn(Mod);
 	view -> 
 	    Window = dbg_wx_mon_win:get_window(State#state.win),
diff --git a/lib/debugger/src/dbg_wx_mon_win.erl b/lib/debugger/src/dbg_wx_mon_win.erl
index 2e48210f55..9737c9e67f 100644
--- a/lib/debugger/src/dbg_wx_mon_win.erl
+++ b/lib/debugger/src/dbg_wx_mon_win.erl
@@ -107,31 +107,31 @@ create_win_batch(Title, Menus) ->
     Hlb = 200,
     Listbox = wxListBox:new(Panel, ?wxID_ANY, [{size,{?Wf,Hlb}},
 					       {style,?wxLB_SINGLE}]),
-    wxSizer:add(LeftSz,Listbox,[{proportion,1},{border,3},{flag,?wxEXPAND}]),
+    _ = wxSizer:add(LeftSz,Listbox,[{proportion,1},{border,3},{flag,?wxEXPAND}]),
     wxListBox:connect(Listbox, command_listbox_doubleclicked),
     wxListBox:connect(Listbox, right_down),
 
     SBox = wxStaticBox:new(Panel, ?wxID_ANY, "Auto Attach:"),
     SBS  = wxStaticBoxSizer:new(SBox, ?wxVERTICAL),
     Fbtn = wxCheckBox:new(Panel, ?autoId, "First Call"),
-    wxSizer:add(SBS,Fbtn),
+    _ = wxSizer:add(SBS,Fbtn),
     Bbtn = wxCheckBox:new(Panel, ?autoId, "On Break"),
-    wxSizer:add(SBS,Bbtn),
+    _ = wxSizer:add(SBS,Bbtn),
     Ebtn = wxCheckBox:new(Panel, ?autoId, "On Exit"),
-    wxSizer:add(SBS,Ebtn),
+    _ = wxSizer:add(SBS,Ebtn),
     wxFrame:connect(Panel, command_checkbox_clicked),
-    wxSizer:add(LeftSz,SBS, [{flag,?wxEXPAND}]),
+    _ = wxSizer:add(LeftSz,SBS, [{flag,?wxEXPAND}]),
 
     SLabel = wxStaticText:new(Panel, ?wxID_ANY, "Stack Trace:\n On (with tail)"), 
-    wxSizer:add(LeftSz,SLabel),
+    _ = wxSizer:add(LeftSz,SLabel),
     BLabel = wxStaticText:new(Panel, ?wxID_ANY, "Back Trace Size:\n 50000"), 
-    wxSizer:add(LeftSz,BLabel),
+    _ = wxSizer:add(LeftSz,BLabel),
     
     StringsBox = wxStaticBox:new(Panel, ?wxID_ANY, "Strings:"),
     StringsBS  = wxStaticBoxSizer:new(StringsBox, ?wxVERTICAL),
     Stringsbtn = wxCheckBox:new(Panel, ?stringsId, ?STRTEXT),
-    wxSizer:add(StringsBS,Stringsbtn),
-    wxSizer:add(LeftSz,StringsBS, [{flag,?wxEXPAND}]),
+    _ = wxSizer:add(StringsBS,Stringsbtn),
+    _ = wxSizer:add(LeftSz,StringsBS, [{flag,?wxEXPAND}]),
 
     %% Create list_crtl / grid
     Grid = wxListCtrl:new(Panel, [{winid, ?GRID},
@@ -169,12 +169,12 @@ create_win_batch(Title, Menus) ->
     wxWindow:setFocus(Grid),
 
     %% Put it in the window
-    wxSizer:add(MainSz, LeftSz, [{border, 3}, {flag,?wxALL bor ?wxEXPAND}]),
-    wxSizer:add(MainSz, Grid,   [{border, 3}, {flag,?wxALL bor ?wxEXPAND}, 
+    _ = wxSizer:add(MainSz, LeftSz, [{border, 3}, {flag,?wxALL bor ?wxEXPAND}]),
+    _ = wxSizer:add(MainSz, Grid,   [{border, 3}, {flag,?wxALL bor ?wxEXPAND}, 
 				 {proportion, 1}]),
 
     wxWindow:setSizer(Panel,MainSz),
-    wxSizer:fit(MainSz, Win),
+    _ = wxSizer:fit(MainSz, Win),
     wxSizer:setSizeHints(MainSz,Win),
     
     IconFile = dbg_wx_win:find_icon("erlang_bug.png"),
diff --git a/lib/debugger/src/dbg_wx_src_view.erl b/lib/debugger/src/dbg_wx_src_view.erl
index 571c6b01bb..207c407fbc 100644
--- a/lib/debugger/src/dbg_wx_src_view.erl
+++ b/lib/debugger/src/dbg_wx_src_view.erl
@@ -56,7 +56,7 @@ code_area(Parent, Sizer) ->
 	       end,
     [SetStyle(Style) || Style <- Styles],
     ?stc:setKeyWords(Ed, 0, keyWords()),
-    wxSizer:add(Sizer, Ed, [{proportion,1}, {flag, ?wxEXPAND}]),
+    _ = wxSizer:add(Sizer, Ed, [{proportion,1}, {flag, ?wxEXPAND}]),
     Ed.
 
 
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index f9c60f9b72..6af19af33b 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -321,7 +321,7 @@ gui_cmd('Kill', State) ->
     exit(State#state.pid, kill),
     State;
 gui_cmd('Messages', State) ->
-    case int:meta(State#state.meta, messages) of
+    _ = case int:meta(State#state.meta, messages) of
 	[] ->
 	    dbg_wx_trace_win:eval_output(State#state.win,"< No Messages!\n", bold);
 	Messages ->
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl
index 51687ad4e9..972a917728 100644
--- a/lib/debugger/src/dbg_wx_trace_win.erl
+++ b/lib/debugger/src/dbg_wx_trace_win.erl
@@ -123,7 +123,8 @@
 %%   GS = term()
 %%--------------------------------------------------------------------
 init() ->
-    dbg_wx_win:init().
+    _ = dbg_wx_win:init(),
+    ok.
 
 stop(#winInfo{window=Win}) ->
     (catch wxFrame:destroy(Win)),
@@ -149,29 +150,29 @@ create_win(Parent, Title, Windows, Menus) ->
 		
 		Sizer = wxBoxSizer:new(?wxVERTICAL),
 		Code = code_area(Panel),
-		wxSizer:add(Sizer, Code#sub.win, 
+		_ = wxSizer:add(Sizer, Code#sub.win, 
 			    [{proportion,1}, {border, 2}, 
 			     {flag, ?wxEXPAND bor ?wxDOWN}]),
 		wxSizer:setVirtualSizeHints(Sizer, Code#sub.win),
 
 		ExpandWithBorder = [{border, 3},{flag,?wxEXPAND bor ?wxALL}],
 		Search = search_area(Panel),
-		wxSizer:add(Sizer, Search#sub.win, ExpandWithBorder),
+		_ = wxSizer:add(Sizer, Search#sub.win, ExpandWithBorder),
 		Bs     = button_area(Panel),
-		wxSizer:add(Sizer, Bs#sub.win, ExpandWithBorder),
+		_ = wxSizer:add(Sizer, Bs#sub.win, ExpandWithBorder),
 
 		InfoArea = wxBoxSizer:new(?wxHORIZONTAL),
 		wxSizer:setMinSize(InfoArea, {100, ?EVAL_H}),
 		Eval  = eval_area(Panel),
-		wxSizer:add(InfoArea, Eval#sub.win, [{proportion,1},{flag,?wxEXPAND}]),
+		_ = wxSizer:add(InfoArea, Eval#sub.win, [{proportion,1},{flag,?wxEXPAND}]),
 		Bind  = bind_area(Panel),		
-		wxSizer:add(InfoArea, Bind#sub.win, 
+		_ = wxSizer:add(InfoArea, Bind#sub.win, 
 			    [{proportion,1},{border, 2}, 
 			     {flag,?wxEXPAND bor ?wxLEFT}]),
-		wxSizer:add(Sizer, InfoArea, ExpandWithBorder),
+		_ = wxSizer:add(Sizer, InfoArea, ExpandWithBorder),
 		
 		Trace = trace_area(Panel),
-		wxSizer:add(Sizer, Trace#sub.win, ExpandWithBorder),
+		_ = wxSizer:add(Sizer, Trace#sub.win, ExpandWithBorder),
 		SB    = wxFrame:createStatusBar(Win,[]),
 
 		%% Note id and lastId to get the event when it dragged is complete
@@ -192,7 +193,7 @@ create_win(Parent, Title, Windows, Menus) ->
 		
 		Wi = show_windows(enable_windows(Wi0,Windows)),
 		wxWindow:setSizer(Panel, Sizer),
-		wxSizer:fit(Sizer, Win),
+		_ = wxSizer:fit(Sizer, Win),
 		wxSizer:setSizeHints(Sizer,Win),
 
 		IconFile = dbg_wx_win:find_icon("erlang_bug.png"),
@@ -230,11 +231,11 @@ get_window(WinInfo) ->
 %%--------------------------------------------------------------------
 configure(Wi=#winInfo{window=Win,m_szr={Panel,Sizer}}) ->
     wx:batch(fun() ->
-		     show_windows(Wi),
+		     _ = show_windows(Wi),
 		     wxSizer:layout(Sizer),
 		     %%wxWindow:setSizerAndFit(Panel,Sizer),
 		     wxWindow:setSizer(Panel, Sizer),
-		     wxSizer:fit(Sizer, Win),
+		     _ = wxSizer:fit(Sizer, Win),
 		     wxSizer:setSizeHints(Sizer,Win),		
 		     Wi
 	     end).
@@ -242,10 +243,10 @@ configure(Wi=#winInfo{window=Win,m_szr={Panel,Sizer}}) ->
 configure(Wi0=#winInfo{window=Win,m_szr={Panel,Sizer}}, Windows) ->
     wx:batch(fun() -> 
 		     Wi = enable_windows(Wi0, Windows),
-		     show_windows(Wi),
+		     _ = show_windows(Wi),
 		     wxSizer:layout(Sizer),
 		     wxWindow:setSizer(Panel, Sizer),
-		     wxSizer:fit(Sizer, Win),
+		     _ = wxSizer:fit(Sizer, Win),
 		     wxSizer:setSizeHints(Sizer,Win),		
 		     Wi
 	     end).
@@ -348,7 +349,7 @@ add_break(WinInfo, Menu, {{Mod,Line},[Status|_Options]}=Break) ->
     case WinInfo#winInfo.editor of
 	{Mod, Editor} ->
 	    dbg_wx_code:add_break_to_code(Editor, Line, Status);
-	_ -> ignore
+	_ -> ok
     end,
     add_break_to_menu(WinInfo, Menu, Break).
 
@@ -372,7 +373,7 @@ update_break(WinInfo, {{Mod,Line},[Status|_Options]}=Break) ->
     case WinInfo#winInfo.editor of
 	{Mod, Editor} ->
 	    dbg_wx_code:add_break_to_code(Editor, Line, Status);
-	_ -> ignore
+	_ -> ok
     end,
     update_break_in_menu(WinInfo, Break).
 
@@ -929,7 +930,7 @@ button_area(Parent) ->
 		       B=wxButton:new(Parent, Button, 
 				      [{label,dbg_wx_win:to_string(Name)}]),
 		       Id = wxWindow:getId(B),
-		       wxSizer:add(Sz,B, []),
+		       _ = wxSizer:add(Sz,B, []),
 		       wxButton:connect(B, command_button_clicked, [{id,Id}])
 	       end, buttons()),
     #sub{name='Button Area', win=Sz}.
@@ -938,22 +939,22 @@ button_area(Parent) ->
 
 search_area(Parent) ->
     HSz = wxBoxSizer:new(?wxHORIZONTAL),
-    wxSizer:add(HSz, wxStaticText:new(Parent, ?wxID_ANY, "Find:"), 
+    _ = wxSizer:add(HSz, wxStaticText:new(Parent, ?wxID_ANY, "Find:"), 
 		[{flag,?wxALIGN_CENTER_VERTICAL}]),
     TC1 = wxTextCtrl:new(Parent, ?SEARCH_ENTRY, [{style, ?wxTE_PROCESS_ENTER}]), 
-    wxSizer:add(HSz, TC1,  [{proportion,3}, {flag, ?wxEXPAND}]),
+    _ = wxSizer:add(HSz, TC1,  [{proportion,3}, {flag, ?wxEXPAND}]),
     Nbtn = wxRadioButton:new(Parent, ?wxID_ANY, "Next"),
     wxRadioButton:setValue(Nbtn, true),
-    wxSizer:add(HSz,Nbtn,[{flag,?wxALIGN_CENTER_VERTICAL}]),
+    _ = wxSizer:add(HSz,Nbtn,[{flag,?wxALIGN_CENTER_VERTICAL}]),
     Pbtn = wxRadioButton:new(Parent, ?wxID_ANY, "Previous"),
-    wxSizer:add(HSz,Pbtn,[{flag,?wxALIGN_CENTER_VERTICAL}]),
+    _ = wxSizer:add(HSz,Pbtn,[{flag,?wxALIGN_CENTER_VERTICAL}]),
     Cbtn = wxCheckBox:new(Parent, ?wxID_ANY, "Match Case"),
-    wxSizer:add(HSz,Cbtn,[{flag,?wxALIGN_CENTER_VERTICAL}]),
-    wxSizer:add(HSz, 15,15, [{proportion,1}, {flag, ?wxEXPAND}]),
-    wxSizer:add(HSz, wxStaticText:new(Parent, ?wxID_ANY, "Goto Line:"), 
+    _ = wxSizer:add(HSz,Cbtn,[{flag,?wxALIGN_CENTER_VERTICAL}]),
+    _ = wxSizer:add(HSz, 15,15, [{proportion,1}, {flag, ?wxEXPAND}]),
+    _ = wxSizer:add(HSz, wxStaticText:new(Parent, ?wxID_ANY, "Goto Line:"), 
 		[{flag,?wxALIGN_CENTER_VERTICAL}]),
     TC2 = wxTextCtrl:new(Parent, ?GOTO_ENTRY, [{style, ?wxTE_PROCESS_ENTER}]), 
-    wxSizer:add(HSz, TC2,  [{proportion,0}, {flag, ?wxEXPAND}]),
+    _ = wxSizer:add(HSz, TC2,  [{proportion,0}, {flag, ?wxEXPAND}]),
     wxTextCtrl:connect(TC1, command_text_updated),
     wxTextCtrl:connect(TC1, command_text_enter),
     wxTextCtrl:connect(TC1, kill_focus),
@@ -969,14 +970,14 @@ eval_area(Parent) ->
     VSz = wxBoxSizer:new(?wxVERTICAL),
     HSz = wxBoxSizer:new(?wxHORIZONTAL),
     
-    wxSizer:add(HSz, wxStaticText:new(Parent, ?wxID_ANY, "Evaluator:"), 
+    _ = wxSizer:add(HSz, wxStaticText:new(Parent, ?wxID_ANY, "Evaluator:"), 
 		[{flag,?wxALIGN_CENTER_VERTICAL}]),
     TC = wxTextCtrl:new(Parent, ?EVAL_ENTRY, [{style, ?wxTE_PROCESS_ENTER}]), 
-    wxSizer:add(HSz, TC,  [{proportion,1}, {flag, ?wxEXPAND}]),
-    wxSizer:add(VSz, HSz, [{flag, ?wxEXPAND}]),
+    _ = wxSizer:add(HSz, TC,  [{proportion,1}, {flag, ?wxEXPAND}]),
+    _ = wxSizer:add(VSz, HSz, [{flag, ?wxEXPAND}]),
     TL = wxTextCtrl:new(Parent, ?EVAL_LOG, [{style, ?wxTE_DONTWRAP bor 
 					  ?wxTE_MULTILINE bor ?wxTE_READONLY}]), 
-    wxSizer:add(VSz, TL, [{proportion,5}, {flag, ?wxEXPAND}]),
+    _ = wxSizer:add(VSz, TL, [{proportion,5}, {flag, ?wxEXPAND}]),
     
     wxTextCtrl:connect(TC, command_text_enter),
     #sub{name='Evaluator Area', win=VSz, in=TC, out=TL}.
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index 1ff8818bbe..25ffc5054c 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -43,7 +43,8 @@
 %%   GS = term()
 %%--------------------------------------------------------------------
 init() ->
-    wx:new().
+    _ = wx:new(),
+    ok.
 
 %%--------------------------------------------------------------------
 %% create_menus(MenuBar, [Menu])
@@ -80,12 +81,12 @@ create_menus(_MB,[], _Win,Id) ->
     Id.
 
 create_menu_item(Menu, [separator|Is], Win, Id,Connect) ->
-    wxMenu:appendSeparator(Menu),
+    _ = wxMenu:appendSeparator(Menu),
     create_menu_item(Menu,Is,Win,Id+1,Connect);
 create_menu_item(Menu, [{Name, _N, cascade, Items}|Is], Win, Id0,Connect) ->
     Sub = wxMenu:new([]),
     Id = create_menu_item(Sub, Items, Win, Id0, false),
-    wxMenu:append(Menu, ?wxID_ANY, menu_name(Name,ignore), Sub),
+    _ = wxMenu:append(Menu, ?wxID_ANY, menu_name(Name,ignore), Sub),
     %% Simulate GS sub checkBox/RadioBox behaviour
     Self = self(),
     Butts = [{MI,get(MI)} || {MI,_,_} <- Items],
@@ -99,8 +100,8 @@ create_menu_item(Menu, [{Name, _N, cascade, Items}|Is], Win, Id0,Connect) ->
 		     Enabled = lists:foldl(IsChecked, [], Butts),
 		     Self ! Ev#wx{userData={Name, Enabled}}
 	     end,
-    wxMenu:connect(Win, command_menu_selected, 
-		   [{id,Id0},{lastId, Id-1},{callback,Filter}]),
+    _ = wxMenu:connect(Win, command_menu_selected,
+		       [{id,Id0},{lastId, Id-1},{callback,Filter}]),
     create_menu_item(Menu, Is, Win, Id, Connect);
 create_menu_item(Menu, [{Name,Pos}|Is], Win, Id, Connect) -> 
     MenuId = case lists:member(Name, ['Debugger']) of
@@ -168,7 +169,7 @@ add_break(Win, MenuName, Point) ->
     Delete = wxMenu:appendRadioItem(Trigger, ?wxID_ANY,"Delete"),
     Add(Delete, {break,Point,{trigger,delete}}),
 
-    wxMenu:append(Sub, ?wxID_ANY, "Trigger Action", Trigger),
+    _ = wxMenu:append(Sub, ?wxID_ANY, "Trigger Action", Trigger),
     MenuBtn = wxMenu:append(Menu,?wxID_ANY, Label, Sub),
 
     #break{mb={Menu,MenuBtn}, 
diff --git a/lib/debugger/src/dbg_wx_winman.erl b/lib/debugger/src/dbg_wx_winman.erl
index efa58ae325..ca858fa4bb 100644
--- a/lib/debugger/src/dbg_wx_winman.erl
+++ b/lib/debugger/src/dbg_wx_winman.erl
@@ -100,11 +100,11 @@ update_windows_menu(Win, [MonInfo|Infos]) ->
     OldItems = wxMenu:getMenuItems(Menu),
     [wxMenu:delete(Menu, Item) || Item <- OldItems],
     menuitem(Win, Menu,MonInfo, 700),
-    wxMenu:appendSeparator(Menu),
+    _ = wxMenu:appendSeparator(Menu),
     wx:foldl(fun(Info,Acc) -> menuitem(Win,Menu,Info,Acc) end, 701, Infos).
 
 menuitem(Window, Menu, {Title, Win}, Id) ->
-    wxMenu:append(Menu, Id, Title),
+    _ = wxMenu:append(Menu, Id, Title),
     wxWindow:connect(Window, command_menu_selected, 
 		     [{id,Id},{userData,{dbg_ui_winman,Win}}]),
     Id+1.
diff --git a/lib/debugger/src/i.erl b/lib/debugger/src/i.erl
index 4ed5265bdf..2da3e77618 100644
--- a/lib/debugger/src/i.erl
+++ b/lib/debugger/src/i.erl
@@ -108,7 +108,7 @@ ib(Module,Function,Arity) ->
 
 ib(Module,Function,Arity,Cond) ->
     Breaks1 = int:all_breaks(Module),
-    int:break_in(Module,Function,Arity),
+    ok = int:break_in(Module,Function,Arity),
     Breaks2 = int:all_breaks(Module),
     lists:foreach(fun({Mod,Line}) -> int:test_at_break(Mod,Line,Cond) end,
 		  Breaks2--Breaks1).
diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl
index 3906c22afd..e5bade9abe 100644
--- a/lib/debugger/src/int.erl
+++ b/lib/debugger/src/int.erl
@@ -352,10 +352,10 @@ start() -> dbg_iserver:start().
 stop() ->
     lists:foreach(
       fun(Mod) ->
-	      everywhere(distributed,
-			 fun() ->
+	      _ = everywhere(distributed,
+			     fun() ->
 				 erts_debug:breakpoint({Mod,'_','_'}, false)
-			 end)
+			     end)
       end,
       interpreted()),
     dbg_iserver:stop().
@@ -524,21 +524,21 @@ check(Mod) when is_atom(Mod) -> catch check_module(Mod);
 check(File) when is_list(File) -> catch check_file(File).
 
 load({Mod, Src, Beam, BeamBin, Exp, Abst}, Dist) ->
-    everywhere(Dist,
-	       fun() ->
+    _ = everywhere(Dist,
+		   fun() ->
 		       code:purge(Mod),
 		       erts_debug:breakpoint({Mod,'_','_'}, false),
 		       {module,Mod} = code:load_binary(Mod, Beam, BeamBin)
-	       end),
+		   end),
     case erl_prim_loader:get_file(filename:absname(Src)) of
 	{ok, SrcBin, _} ->
 	    MD5 = code:module_md5(BeamBin),
 	    Bin = term_to_binary({interpreter_module,Exp,Abst,SrcBin,MD5}),
 	    {module, Mod} = dbg_iserver:safe_call({load, Mod, Src, Bin}),
-	    everywhere(Dist,
-		       fun() ->
+	    _ = everywhere(Dist,
+			   fun() ->
 			       true = erts_debug:breakpoint({Mod,'_','_'}, true) > 0
-		       end),
+			   end),
 	    {module, Mod};
 	error ->
 	    error
@@ -738,9 +738,9 @@ del_mod(AbsMod, Dist) ->
 		  list_to_atom(filename:basename(AbsMod,".erl"))
 	  end,
     dbg_iserver:safe_cast({delete, Mod}),
-    everywhere(Dist,
-	       fun() ->
+    _ = everywhere(Dist,
+		   fun() ->
 		       erts_debug:breakpoint({Mod,'_','_'}, false),
 		       erlang:yield()
-	       end),
+		   end),
     ok.