aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrik Nyblom <pan@erlang.org>2010-12-20 14:55:23 +0100
committerPatrik Nyblom <pan@erlang.org>2010-12-20 14:55:23 +0100
commit8f15f156e539aaa6d69acc28d527ef6da94d40d3 (patch)
treeb3d4fa1a337a09b7b6e567d61b7e0bf74c7d3dd2
parent69486d5b01b3281ea1c9ca168b2658c1159a82ce (diff)
downloadotp-8f15f156e539aaa6d69acc28d527ef6da94d40d3.tar.gz
otp-8f15f156e539aaa6d69acc28d527ef6da94d40d3.tar.bz2
otp-8f15f156e539aaa6d69acc28d527ef6da94d40d3.zip
Removed dead code
-rw-r--r--lib/stdlib/src/epp.erl10
-rw-r--r--lib/stdlib/src/escript.erl4
2 files changed, 3 insertions, 11 deletions
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index e5ccaddbb4..d4844b8c1e 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -427,10 +427,7 @@ scan_toks(From, St) ->
epp_reply(From, {error,E}),
wait_req_scan(St#epp{location=Cl});
{eof,Cl} ->
- leave_file(From, St#epp{location=Cl});
- {error,_E} ->
- epp_reply(From, {error,{St#epp.location,epp,cannot_parse}}),
- leave_file(wait_request(St), St) %This serious, just exit!
+ leave_file(From, St#epp{location=Cl})
end.
scan_toks([{'-',_Lh},{atom,_Ld,define}=Define|Toks], From, St) ->
@@ -811,10 +808,7 @@ skip_toks(From, St, [I|Sis]) ->
{error,_E,Cl} ->
skip_toks(From, St#epp{location=Cl}, [I|Sis]);
{eof,Cl} ->
- leave_file(From, St#epp{location=Cl,istk=[I|Sis]});
- {error,_E} ->
- epp_reply(From, {error,{St#epp.location,epp,cannot_parse}}),
- leave_file(wait_request(St), St) %This serious, just exit!
+ leave_file(From, St#epp{location=Cl,istk=[I|Sis]})
end;
skip_toks(From, St, []) ->
scan_toks(From, St).
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 99e454f593..7cb02afb11 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -570,9 +570,7 @@ parse_beam(S, File, HeaderSz, CheckOnly) ->
forms_or_bin = Bin}
end;
{error, beam_lib, Reason} when is_tuple(Reason) ->
- fatal(element(1, Reason));
- {error, beam_lib, Reason} ->
- fatal(Reason)
+ fatal(element(1, Reason))
end.
parse_source(S, File, Fd, StartLine, HeaderSz, CheckOnly) ->