X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=dehuff.c;h=8fd4c2072fce46cbe792295fc977a3e7f53b2deb;hb=352c52d38c212a2aa93a9970731c9d7a2f8d4dac;hp=a7254692dd4f90deae10bc2fb571baf9952f26bb;hpb=f6111465adacc2840f4cd25d55b3017cbf0593b2;p=fjl

diff --git a/dehuff.c b/dehuff.c
index a725469..8fd4c20 100644
--- a/dehuff.c
+++ b/dehuff.c
@@ -4,38 +4,9 @@
 
 #include "bytesource.h"
 #include "dehuff.h"
+#include "input.h"
 
-void reliable_read(raw_input_func_t* input_func, void* userdata, uint8_t* buf, size_t len)
-{
-	while (len > 0) {
-		ssize_t bytes_read = input_func(userdata, buf, len);
-		assert(bytes_read <= (ssize_t)len);
-
-		// TODO: We need better error handling here. setjmp()/longjmp()
-		// should hopefully do the trick, but we need to take care for
-		// suspension.
-		if (bytes_read == (ssize_t)-1) {
-			fprintf(stderr, "Input function returned error\n");
-			exit(1);
-		}
-		if (bytes_read == 0) {
-			fprintf(stderr, "Premature EOF\n");
-			exit(1);
-		}
-
-		buf += bytes_read;
-		len -= bytes_read;
-	}
-}
-
-uint16_t read_length(raw_input_func_t* input_func, void* userdata)
-{
-	uint8_t buf[2];
-	reliable_read(input_func, userdata, buf, 2);
-	return (buf[0] << 8) | buf[1];
-}
-
-void read_huffman_tables(huffman_tables_t* dst, raw_input_func_t* input_func, void* userdata)
+void read_huffman_tables(huffman_tables_t* dst, input_func_t* input_func, void* userdata)
 {
 	size_t len = read_length(input_func, userdata);
 	assert(len > 2);