diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 20:24:43 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 20:31:26 +0300 |
| commit | 87fb5132be7436c6d78ba989e977e36bd04abc6c (patch) | |
| tree | 521d996d0a898033aafcd82f2601a4d8d48a5ab4 | |
| parent | 95265dd3ad8e149d94d08e1a73970fb0bbf55b49 (diff) | |
Make JID related functions from jlib.erl deprecated
| -rw-r--r-- | rebar.config.script | 2 | ||||
| -rw-r--r-- | src/jlib.erl | 12 | ||||
| -rw-r--r-- | tools/xmpp_codec.erl | 6 | ||||
| -rw-r--r-- | tools/xmpp_codec.spec | 6 |
4 files changed, 19 insertions, 7 deletions
diff --git a/rebar.config.script b/rebar.config.script index 9e213b863..dd005d455 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -187,7 +187,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++ ++ TestConfig ++ "-include " ++ filename:join([Cwd, "tools"])}, {xref_warnings, false}, - {xref_checks, []}, + {xref_checks, [deprecated_function_calls]}, {xref_queries, [{"(XC - UC) || (XU - X - B - " ++ string:join(CfgXrefs, " - ") ++ ")", []}]}, diff --git a/src/jlib.erl b/src/jlib.erl index 711c432e6..edeb6cd01 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -62,6 +62,18 @@ nameprep/1, resourceprep/1, jid_tolower/1, jid_remove_resource/1, jid_replace_resource/2]). +-deprecated([{make_jid, '_'}, + {split_jid, 1}, + {string_to_jid, 1}, + {jid_to_string, 1}, + {is_nodename, 1}, + {nodeprep, 1}, + {nameprep, 1}, + {resourceprep, 1}, + {jid_tolower, 1}, + {jid_remove_resource, 1}, + {jid_replace_resource, 2}]). + -include("ejabberd.hrl"). -include("jlib.hrl"). diff --git a/tools/xmpp_codec.erl b/tools/xmpp_codec.erl index 987eb7c41..3adceabc4 100644 --- a/tools/xmpp_codec.erl +++ b/tools/xmpp_codec.erl @@ -2533,15 +2533,15 @@ dec_bool(<<"true">>) -> true; dec_bool(<<"1">>) -> true. resourceprep(R) -> - case jlib:resourceprep(R) of + case jid:resourceprep(R) of error -> erlang:error(badarg); R1 -> R1 end. -enc_jid(J) -> jlib:jid_to_string(J). +enc_jid(J) -> jid:to_string(J). dec_jid(Val) -> - case jlib:string_to_jid(Val) of + case jid:from_string(Val) of error -> erlang:error(badarg); J -> J end. diff --git a/tools/xmpp_codec.spec b/tools/xmpp_codec.spec index 38508ce6c..8d087c8b6 100644 --- a/tools/xmpp_codec.spec +++ b/tools/xmpp_codec.spec @@ -2421,7 +2421,7 @@ enc_utc(Val) -> jlib:now_to_utc_string(Val). dec_jid(Val) -> - case jlib:string_to_jid(Val) of + case jid:from_string(Val) of error -> erlang:error(badarg); J -> @@ -2429,10 +2429,10 @@ dec_jid(Val) -> end. enc_jid(J) -> - jlib:jid_to_string(J). + jid:to_string(J). resourceprep(R) -> - case jlib:resourceprep(R) of + case jid:resourceprep(R) of error -> erlang:error(badarg); R1 -> |