void read_huffman_tables(huffman_tables_t* dst, input_func_t* input_func, void* userdata)
{
- size_t len = read_length(input_func, userdata);
+ size_t len = read_uint16(input_func, userdata);
assert(len > 2);
len -= 2;
}
}
-uint16_t read_length(raw_input_func_t* input_func, void* userdata)
+uint8_t read_uint8(raw_input_func_t* input_func, void* userdata)
+{
+ uint8_t ret;
+ reliable_read(input_func, userdata, &ret, 1);
+ return ret;
+}
+
+uint16_t read_uint16(raw_input_func_t* input_func, void* userdata)
{
uint8_t buf[2];
reliable_read(input_func, userdata, buf, 2);
typedef ssize_t (raw_input_func_t)(void*, uint8_t*, size_t);
void reliable_read(raw_input_func_t* input_func, void* userdata, uint8_t* buf, size_t len);
-uint16_t read_length(raw_input_func_t* input_func, void* userdata);
+
+uint8_t read_uint8(raw_input_func_t* input_func, void* userdata);
+uint16_t read_uint16(raw_input_func_t* input_func, void* userdata);
#endif /* !defined(_INPUT_H) */