From 1994c8a17463863737847ca04e4b17a358394e23 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Mon, 5 Sep 2011 15:28:01 +1000 Subject: [PATCH] Change argument of open_port/2 to string in order to shut up the dialyzer --- src/ejabberd_app.erl | 2 +- src/ejabberd_zlib/ejabberd_zlib.erl | 4 ++-- src/mod_irc/iconv.erl | 2 +- src/sha.erl | 2 +- src/stringprep/stringprep.erl | 2 +- src/tls/tls.erl | 6 +++--- src/xml_stream.erl | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index fc60c8b99..32b4b9073 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -110,7 +110,7 @@ init() -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, expat_erl}, [binary]), + Port = open_port({spawn, "expat_erl"}, [binary]), loop(Port). diff --git a/src/ejabberd_zlib/ejabberd_zlib.erl b/src/ejabberd_zlib/ejabberd_zlib.erl index 9d90a0dc5..dbfd57a07 100644 --- a/src/ejabberd_zlib/ejabberd_zlib.erl +++ b/src/ejabberd_zlib/ejabberd_zlib.erl @@ -63,7 +63,7 @@ init([]) -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, ejabberd_zlib_drv}, [binary]), + Port = open_port({spawn, "ejabberd_zlib_drv"}, [binary]), {ok, Port}. @@ -99,7 +99,7 @@ enable_zlib(SockMod, Socket) -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, ejabberd_zlib_drv}, [binary]), + Port = open_port({spawn, "ejabberd_zlib_drv"}, [binary]), {ok, #zlibsock{sockmod = SockMod, socket = Socket, zlibport = Port}}. disable_zlib(#zlibsock{sockmod = SockMod, socket = Socket, zlibport = Port}) -> diff --git a/src/mod_irc/iconv.erl b/src/mod_irc/iconv.erl index d80db78ac..dde4d7e8d 100644 --- a/src/mod_irc/iconv.erl +++ b/src/mod_irc/iconv.erl @@ -52,7 +52,7 @@ init([]) -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, iconv_erl}, []), + Port = open_port({spawn, "iconv_erl"}, []), ets:new(iconv_table, [set, public, named_table]), ets:insert(iconv_table, {port, Port}), {ok, Port}. diff --git a/src/sha.erl b/src/sha.erl index 5a2ed3f1d..33a82b889 100644 --- a/src/sha.erl +++ b/src/sha.erl @@ -47,7 +47,7 @@ start() -> end, case Res of ok -> - Port = open_port({spawn, ?DRIVER}, [binary]), + Port = open_port({spawn, atom_to_list(?DRIVER)}, [binary]), register(?DRIVER, Port); {error, Reason} -> ?CRITICAL_MSG("unable to load driver '~s': ~s", diff --git a/src/stringprep/stringprep.erl b/src/stringprep/stringprep.erl index 9db6d2847..e14bfca17 100644 --- a/src/stringprep/stringprep.erl +++ b/src/stringprep/stringprep.erl @@ -60,7 +60,7 @@ init([]) -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, stringprep_drv}, []), + Port = open_port({spawn, "stringprep_drv"}, []), register(?STRINGPREP_PORT, Port), {ok, Port}. diff --git a/src/tls/tls.erl b/src/tls/tls.erl index 967cf9249..dfb9d2306 100644 --- a/src/tls/tls.erl +++ b/src/tls/tls.erl @@ -84,7 +84,7 @@ init([]) -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, tls_drv}, [binary]), + Port = open_port({spawn, "tls_drv"}, [binary]), Res = port_control(Port, ?SET_CERTIFICATE_FILE_ACCEPT, "./ssl.pem" ++ [0]), case Res of <<0>> -> @@ -130,7 +130,7 @@ tcp_to_tls(TCPSocket, Options) -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, tls_drv}, [binary]), + Port = open_port({spawn, "tls_drv"}, [binary]), Flags = case lists:member(verify_none, Options) of true -> @@ -267,7 +267,7 @@ test() -> ok -> ok; {error, already_loaded} -> ok end, - Port = open_port({spawn, tls_drv}, [binary]), + Port = open_port({spawn, "tls_drv"}, [binary]), ?PRINT("open_port: ~p~n", [Port]), PCRes = port_control(Port, ?SET_CERTIFICATE_FILE_ACCEPT, "./ssl.pem" ++ [0]), diff --git a/src/xml_stream.erl b/src/xml_stream.erl index 1deb8936e..205945fce 100644 --- a/src/xml_stream.erl +++ b/src/xml_stream.erl @@ -99,7 +99,7 @@ new(CallbackPid) -> new(CallbackPid, infinity). new(CallbackPid, MaxSize) -> - Port = open_port({spawn, expat_erl}, [binary]), + Port = open_port({spawn, "expat_erl"}, [binary]), #xml_stream_state{callback_pid = CallbackPid, port = Port, stack = [], @@ -140,7 +140,7 @@ close(#xml_stream_state{port = Port}) -> parse_element(Str) -> - Port = open_port({spawn, expat_erl}, [binary]), + Port = open_port({spawn, "expat_erl"}, [binary]), Res = port_control(Port, ?PARSE_FINAL_COMMAND, Str), port_close(Port), process_element_events(binary_to_term(Res)).