aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2011-09-27 07:52:07 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2011-09-27 07:52:07 +0200
commit0e132c07e92835811e01bec415399916afc3e44d (patch)
tree3a5543416144a4b57263ad259ef809104e18bdf0
parent1eb09dda09fa3de6b05f09d881065a0a7de2624f (diff)
parente423e12e8ad87348ca6c583b0ebdbe5de2aefc6f (diff)
downloadotp-0e132c07e92835811e01bec415399916afc3e44d.tar.gz
otp-0e132c07e92835811e01bec415399916afc3e44d.tar.bz2
otp-0e132c07e92835811e01bec415399916afc3e44d.zip
Merge branch 'dev' into major
* dev: Update preloaded modules erl_prim_loader: Eliminate dialyzer warning Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
-rw-r--r--erts/preloaded/ebin/erl_prim_loader.beambin50400 -> 52880 bytes
-rw-r--r--erts/preloaded/src/erl_prim_loader.erl14
2 files changed, 4 insertions, 10 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index f08620b128..c7daf923c5 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
Binary files differ
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index 4a72bae105..0b4db3d9d0 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -470,7 +470,7 @@ efile_get_file_from_port2(#state{prim_state = PS} = State, File) ->
end.
efile_get_file_from_port3(State, File, [P | Paths]) ->
- case efile_get_file_from_port2(State, concat([P,"/",File])) of
+ case efile_get_file_from_port2(State, join(P, File)) of
{{error,Reason},State1} when Reason =/= emfile ->
case Paths of
[] -> % return last error
@@ -644,7 +644,7 @@ inet_get_file_from_port(State, File, Paths) ->
end.
inet_get_file_from_port1(File, [P | Paths], State) ->
- File1 = concat([P,"/",File]),
+ File1 = join(P, File),
case inet_send_and_rcv({get,File1}, File1, State) of
{{error,Reason},State1} ->
case Paths of
@@ -1152,14 +1152,8 @@ send_all(U, [IP | AL], Cmd) ->
send_all(U, AL, Cmd);
send_all(_U, [], _) -> ok.
-%%concat([A|T]) when is_atom(A) -> %Atom
-%% atom_to_list(A) ++ concat(T);
-concat([C|T]) when C >= 0, C =< 255 ->
- [C|concat(T)];
-concat([S|T]) -> %String
- S ++ concat(T);
-concat([]) ->
- [].
+join(P, F) ->
+ P ++ "/" ++ F.
member(X, [X|_]) -> true;
member(X, [_|Y]) -> member(X, Y);