Commit f8aea23e895641029cc929e53148f3b8a85b13a1
2018-02-12T00:08:11
delta bases are no longer compressed; update delta_test
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/regress/delta/delta_test.c b/regress/delta/delta_test.c
index ca34b8e..eb671e9 100644
--- a/regress/delta/delta_test.c
+++ b/regress/delta/delta_test.c
@@ -44,52 +44,6 @@ struct delta_test {
{ "aabbccdd", "\x08\x08\x91\x04\x04\x04xxxx", 10, "ccddxxxx" },
};
-static const struct got_error *
-compress_to_file(FILE **outfile, const char *input, size_t inlen)
-{
- const struct got_error *err = NULL;
- z_stream z;
- char buf[2048];
- char *inbuf;
- int ret;
- size_t n;
-
- memset(&z, 0, sizeof(z));
- z.zalloc = Z_NULL;
- z.zfree = Z_NULL;
-
- if (deflateInit(&z, 8) != Z_OK)
- return got_error(GOT_ERR_IO);
-
- *outfile = got_opentemp();
- if (*outfile == NULL)
- return got_error_from_errno();
-
- z.next_in = (Bytef *)input;
- z.avail_in = inlen;
- z.next_out = buf;
- z.avail_out = sizeof(buf);
- /* Our output buffer is large enough so one round should be enough. */
- ret = deflate(&z, Z_FINISH);
- if (ret != Z_STREAM_END || z.avail_out == 0) {
- err = got_error(GOT_ERR_COMPRESSION);
- goto done;
- }
-
- deflateEnd(&z);
-
- n = fwrite(buf, 1, z.avail_out, *outfile);
- if (n != z.avail_out)
- err = got_ferror(*outfile, GOT_ERR_IO);
-done:
- if (err) {
- fclose(*outfile);
- *outfile = NULL;
- } else
- rewind(*outfile);
- return err;
-}
-
static int
delta_combine()
{
@@ -108,9 +62,18 @@ delta_combine()
size_t n, len, result_len;
len = strlen(dt->base);
- err = compress_to_file(&base_file, dt->base, len);
- if (err)
+ base_file = got_opentemp();
+ if (base_file == NULL) {
+ err = got_error_from_errno();
break;
+ }
+
+ n = fwrite(dt->base, 1, len, base_file);
+ if (n != len) {
+ err = got_ferror(base_file, GOT_ERR_IO);
+ break;
+ }
+ rewind(base_file);
err = got_delta_apply(base_file, dt->delta, dt->delta_len,
result_file);