From 9e10787013d9639b44560959f8f69785e11a138b Mon Sep 17 00:00:00 2001 From: lwalkin Date: Mon, 13 Oct 2014 23:40:55 +0000 Subject: [PATCH] trailer_or_error is not required for correctness --- src/jiffy.erl | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/jiffy.erl b/src/jiffy.erl index 7e5d34e..23a0c9d 100644 --- a/src/jiffy.erl +++ b/src/jiffy.erl @@ -19,23 +19,13 @@ decode(Data, Opts) when is_binary(Data), is_list(Opts) -> {partial, EJson} -> finish_decode(EJson); {iter, Decoder, Val, Objs, Curr} -> - trailer_or_error(decode_loop(Data, Decoder, Val, Objs, Curr), Opts, Data); + decode_loop(Data, Decoder, Val, Objs, Curr); EJson -> EJson end; decode(Data, Opts) when is_list(Data) -> decode(iolist_to_binary(Data), Opts). -% Only return trailing data if explicitly requested in the options. -trailer_or_error({with_trailer, _EJson, TrailerData} = WithTrailer, Opts, Data) -> - case lists:member(with_trailer, Opts) of - true -> WithTrailer; - false -> - AtByte = iolist_size(Data) - iolist_size(TrailerData) + 1, - throw({error,{AtByte,invalid_trailing_data}}) - end; -trailer_or_error(EJson, _Opts, _Data) -> EJson. - encode(Data) -> encode(Data, []).