@@ -4,9 +4,7 @@ use cookie_factory::GenError;
44use nom:: AsBytes ;
55
66use crate :: ebml:: { Date , EbmlHeader } ;
7- use crate :: serializer:: cookie_utils:: {
8- gen_at_offset, gen_skip, gen_slice, set_be_f64, set_be_i8, tuple,
9- } ;
7+ use crate :: serializer:: cookie_utils:: { gen_at_offset, gen_skip, gen_slice, set_be_f64, tuple} ;
108
119const ALLOWED_ID_VALUES : u64 = ( 1u64 << 56 ) - 1 ;
1210
@@ -93,32 +91,6 @@ pub(crate) fn gen_uint(
9391 }
9492}
9593
96- //FIXME: is it the right implementation?
97- pub ( crate ) fn gen_int (
98- num : i64 ,
99- ) -> impl Fn ( ( & mut [ u8 ] , usize ) ) -> Result < ( & mut [ u8 ] , usize ) , GenError > {
100- move |mut input| {
101- let needed_bytes = vint_size ( num as u64 ) ?;
102-
103- let mut i = needed_bytes - 1 ;
104- loop {
105- match set_be_i8 ( ( input. 0 , input. 1 ) , ( num >> ( i * 8 ) ) as i8 ) {
106- Ok ( next) => {
107- input = next;
108- }
109- Err ( e) => return Err ( e) ,
110- }
111-
112- if i == 0 {
113- break ;
114- }
115- i -= 1 ;
116- }
117-
118- Ok ( input)
119- }
120- }
121-
12294fn gen_type < T : Copy , G > (
12395 id : u32 ,
12496 size : u64 ,
@@ -199,21 +171,6 @@ pub(crate) fn gen_ebml_uint(
199171 gen_ebml_uint_l ( id, num, move || vint_size ( num) )
200172}
201173
202- pub ( crate ) fn gen_ebml_int (
203- id : u32 ,
204- num : i64 ,
205- ) -> impl Fn ( ( & mut [ u8 ] , usize ) ) -> Result < ( & mut [ u8 ] , usize ) , GenError > {
206- move |input| {
207- let expected_size = vint_size ( num as u64 ) ?;
208- let needed_bytes = vint_size ( expected_size as u64 ) ?;
209-
210- let ( buf, ofs_len) = gen_vid ( id) ( input) ?;
211- let ( buf, start) = gen_skip ( needed_bytes as usize ) ( ( buf, ofs_len) ) ?;
212- let ( buf, end) = gen_int ( num) ( ( buf, start) ) ?;
213- gen_at_offset ( ofs_len, gen_ebml_size ( expected_size, end - start) ) ( ( buf, end) )
214- }
215- }
216-
217174pub ( crate ) fn gen_ebml_str < ' a , ' b > (
218175 id : u32 ,
219176 s : & ' a str ,
0 commit comments