diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-03-09 17:50:14 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-03-09 17:50:14 +0300 |
| commit | c0540e1377f34bc13ba51e79eba6f215062fdbcd (patch) | |
| tree | 5f3e2e712a8063b30f3ddb2d28f1a7e8ff96d899 /src | |
| parent | Make it possible to use SQL as an SM backend (diff) | |
Fix R15B compilation
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_sm_odbc.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_sm_odbc.erl b/src/ejabberd_sm_odbc.erl index ef24fa557..55bbc74fb 100644 --- a/src/ejabberd_sm_odbc.erl +++ b/src/ejabberd_sm_odbc.erl @@ -30,7 +30,7 @@ %%%=================================================================== -spec init() -> ok | {error, any()}. init() -> - Node = ejabberd_odbc:escape(erlang:atom_to_binary(node(), utf8)), + Node = ejabberd_odbc:escape(jlib:atom_to_binary(node())), lists:foldl( fun(Host, ok) -> case ejabberd_odbc:sql_query( @@ -70,7 +70,7 @@ set_session(#session{sid = {Now, Pid}, usr = {U, LServer, R}, PrioS = enc_priority(Priority), TS = now_to_timestamp(Now), PidS = list_to_binary(erlang:pid_to_list(Pid)), - Node = ejabberd_odbc:escape(erlang:atom_to_binary(node(Pid), utf8)), + Node = ejabberd_odbc:escape(jlib:atom_to_binary(node(Pid))), case odbc_queries:update( LServer, <<"sm">>, @@ -145,10 +145,10 @@ get_sessions(LUser, LServer, LResource) -> %%% Internal functions %%%=================================================================== now_to_timestamp({MSec, Sec, USec}) -> - erlang:integer_to_binary((MSec * 1000000 + Sec) * 1000000 + USec). + jlib:integer_to_binary((MSec * 1000000 + Sec) * 1000000 + USec). timestamp_to_now(TS) -> - I = erlang:binary_to_integer(TS), + I = jlib:binary_to_integer(TS), Head = I div 1000000, USec = I rem 1000000, MSec = Head div 1000000, @@ -156,7 +156,7 @@ timestamp_to_now(TS) -> {MSec, Sec, USec}. dec_priority(Prio) -> - case catch erlang:binary_to_integer(Prio) of + case catch jlib:binary_to_integer(Prio) of {'EXIT', _} -> undefined; Int -> @@ -166,7 +166,7 @@ dec_priority(Prio) -> enc_priority(undefined) -> <<"">>; enc_priority(Int) when is_integer(Int) -> - erlang:integer_to_binary(Int). + jlib:integer_to_binary(Int). row_to_session(LServer, [USec, PidS, User, Resource, PrioS, InfoS]) -> Now = timestamp_to_now(USec), |