diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2015-04-08 14:34:56 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2015-04-08 14:34:56 +0300 |
| commit | 5a820aca406b3896f83936d1756031258637898a (patch) | |
| tree | 27933678e8d56ee30f9016818a90248bd23683ab /src/jlib.erl | |
| parent | Add mod_muc_admin contrib. (diff) | |
| parent | Fix lite.sql and convert binary to integer (diff) | |
Merge pull request #486 from saa/sqlite_support
Add SQLite support
Diffstat (limited to 'src/jlib.erl')
| -rw-r--r-- | src/jlib.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jlib.erl b/src/jlib.erl index 76886a7dc..5dbf76e24 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -940,8 +940,10 @@ ip_to_list(IP) -> binary_to_atom(Bin) -> erlang:binary_to_atom(Bin, utf8). -binary_to_integer(Bin) -> - list_to_integer(binary_to_list(Bin)). +binary_to_integer(Bin) when is_binary(Bin) -> + list_to_integer(binary_to_list(Bin)); +binary_to_integer(Bin) when is_integer(Bin) -> + Bin. binary_to_integer(Bin, Base) -> list_to_integer(binary_to_list(Bin), Base). |