diff options
author | Björn Gustavsson <[email protected]> | 2011-09-26 11:32:33 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2011-09-26 11:32:33 +0200 |
commit | 5d9c9606bd3d239f52b6156d07000d1b5bbe0858 (patch) | |
tree | 4821b540fe09bf848662adeefeaeed90032f75df /erts | |
parent | 97f3a064f27843a9f825210c1c7a27075b7b3ad7 (diff) | |
download | otp-5d9c9606bd3d239f52b6156d07000d1b5bbe0858.tar.gz otp-5d9c9606bd3d239f52b6156d07000d1b5bbe0858.tar.bz2 otp-5d9c9606bd3d239f52b6156d07000d1b5bbe0858.zip |
erl_prim_loader: Eliminate dialyzer warning
The concat/1 function is now only used to append lists when
constructing filenames. Thus it is too general and the first
clause (that handles characters) will never be used.
We could just remove the clause that is never used, but then the
name 'concat' would be misleading and someone could use misuse it.
Therefore, replace concat/1 with the join/2 function that can only
be used for joining filename components.
Diffstat (limited to 'erts')
-rw-r--r-- | erts/preloaded/src/erl_prim_loader.erl | 14 |
1 files changed, 4 insertions, 10 deletions
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); |