diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-07 06:22:39 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-07 06:22:39 +0100 |
| commit | fe5c0f0e8dbda1c279884f726fc2dbeff764d5bb (patch) | |
| tree | 73683ae884e95535fc5e6feaf5cbce63b5a18f7e /src | |
| parent | ddb4c7d0f3571f5498bbe025ab5fe5dcdcc3279c (diff) | |
| download | rabbitmq-server-git-fe5c0f0e8dbda1c279884f726fc2dbeff764d5bb.tar.gz | |
refactor
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index d600bdecd2..ae121124ab 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -951,17 +951,15 @@ format_ssl_type_and_value(Type, Value) -> {?'id-at-stateOrProvinceName' , "ST="}, {?'id-at-localityName' , "L="}], case proplists:lookup(Type, Fmts) of - {_, Fmt} -> io_lib:format(Fmt ++ "=~s", [FV]); + {_, Fmt} -> + io_lib:format(Fmt ++ "=~s", [FV]); none when is_tuple(Type) -> - io_lib:format("~s:~s", - [textify(intersperse( ".", tuple_to_list(Type))), FV]); - none -> io_lib:format("~p:~s", [Type, FV]) + TypeL = [io_lib:format("~w", [X]) || X <- tuple_to_list(Type)], + io_lib:format("~s:~s", [rabbit_misc:intersperse(".", TypeL), FV]); + none -> + io_lib:format("~p:~s", [Type, FV]) end. -textify(Xs) -> - lists:map(fun(X) when list(X) -> X; - (X) -> io_lib:format("~p", [X]) end, Xs). - format_ssl_value({printableString, S}) -> S; format_ssl_value({utf8String, Bin}) -> @@ -973,13 +971,6 @@ format_ssl_value({utcTime, [Y1, Y2, M1, M2, D1, D2, H1, H2, format_ssl_value(V) -> V. -intersperse(_, []) -> - []; -intersperse(_, [Y]) -> - [Y]; -intersperse(X, [Y|Ys]) -> - [Y, X | intersperse(X, Ys)]. - %%-------------------------------------------------------------------------- send_to_new_channel(Channel, AnalyzedFrame, State) -> |