From b4338bc38486ba23c123add6ab0f3460cae9bed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 10 May 2016 19:27:48 +0200
Subject: fprof: Fix unmatched return warnings

---
 lib/tools/src/fprof.erl | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'lib/tools/src')

diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index b21eedc625..3c68ff690d 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1003,7 +1003,7 @@ handle_req(#analyse{dest = Dest,
 			already_open ->
 			    ok;
 			ok ->
-			    file:close(DestPid)
+			    ok = file:close(DestPid)
 		    end,
 		    State
 	    end;
@@ -1364,7 +1364,7 @@ tracer_loop(Parent, Handler, State) ->
 	Trace when element(1, Trace) =:= trace_ts ->
 	    tracer_loop(Parent, Handler, Handler(Trace, State));
 	{'EXIT', Parent, Reason} ->
-	    handler(end_of_trace, State),
+	    _ = handler(end_of_trace, State),
 	    exit(Reason);
 	_ ->
 	    tracer_loop(Parent, Handler, State)
@@ -1450,12 +1450,10 @@ end_of_trace(Table, TS) ->
     Procs = get(),
     put(table, Table),
     ?dbg(2, "get() -> ~p~n", [Procs]),
-    lists:map(
-      fun ({Pid, _}) when is_pid(Pid) ->
-	      trace_exit(Table, Pid, TS)
-      end,
-      Procs),
-    erase(),
+    _ = lists:map(fun ({Pid, _}) when is_pid(Pid) ->
+                          trace_exit(Table, Pid, TS)
+                  end, Procs),
+    _ = erase(),
     ok.
 
 
@@ -2047,7 +2045,7 @@ trace_exit(Table, Pid, TS) ->
 	[] ->
 	    ok;
 	[_ | _] = Stack ->
-	    trace_return_to_int(Table, Pid, undefined, TS, Stack),
+	    _ = trace_return_to_int(Table, Pid, undefined, TS, Stack),
 	    ok
     end,
     ok.
@@ -2173,7 +2171,7 @@ trace_clock(_Table, _Pid, _T,
 	    [[{suspend, _}], [{suspend, _}] | _]=_Stack, _Clock) ->
     ?dbg(9, "trace_clock(Table, ~w, ~w, ~w, ~w)~n",
 	 [_Pid, _T, _Stack, _Clock]),
-    void;
+    ok;
 trace_clock(Table, Pid, T, 
 	    [[{garbage_collect, TS0}], [{suspend, _}]], Clock) ->
     trace_clock_1(Table, Pid, T, TS0, undefined, garbage_collect, Clock);
@@ -2188,7 +2186,7 @@ trace_clock(Table, Pid, T, [[{Func0, TS0}], [{Func1, _} | _] | _], Clock) ->
 trace_clock(Table, Pid, T, [[{Func0, TS0}]], Clock) ->
     trace_clock_1(Table, Pid, T, TS0, undefined, Func0, Clock);
 trace_clock(_, _, _, [], _) ->
-    void.
+    ok.
 
 trace_clock_1(Table, Pid, _, _, Caller, suspend, #clocks.own) ->
     clock_add(Table, {Pid, Caller, suspend}, #clocks.own, 0);
-- 
cgit v1.2.3