From acb8fa613e87081267ec9963e5770580208e3e1f Mon Sep 17 00:00:00 2001 From: UENISHI Kota Date: Thu, 1 Jul 2010 01:02:19 +0900 Subject: [PATCH] erlang: adding shorthand fix for {more, undefined} problem --- erlang/msgpack.erl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erlang/msgpack.erl b/erlang/msgpack.erl index c99002c3..d24220be 100644 --- a/erlang/msgpack.erl +++ b/erlang/msgpack.erl @@ -166,7 +166,7 @@ unpack_array_(Remain, 0, RetList) when is_binary(Remain)-> {lists:reverse(RetLis unpack_array_(<<>>, RestLen, _RetList) when RestLen > 0 -> {more, undefined}; unpack_array_(Bin, RestLen, RetList) when is_binary(Bin)-> case unpack(Bin) of - {more, Len} -> {more, undefined}; + {more, _} -> {more, undefined}; {Term, Rest}-> unpack_array_(Rest, RestLen-1, [Term|RetList]) end. @@ -180,11 +180,11 @@ pack_map_([{Key,Value}|Tail], Acc) -> unpack_map_(Bin, 0, Acc) -> {{lists:reverse(Acc)}, Bin}; unpack_map_(Bin, Len, Acc) -> case unpack(Bin) of - { more, MoreLen } -> { more, MoreLen+Len-1 }; - { Key, Rest } -> + {more, _} -> {more, undefined}; + {Key, Rest} -> case unpack(Rest) of - {more, MoreLen} -> { more, MoreLen+Len-1 }; - { Value, Rest2 } -> + {more, _} -> {more, undefined}; + {Value, Rest2} -> unpack_map_(Rest2,Len-1,[{Key,Value}|Acc]) end end.