diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /devel/got/files/patch-lib_delta.c | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'devel/got/files/patch-lib_delta.c')
| -rw-r--r-- | devel/got/files/patch-lib_delta.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/devel/got/files/patch-lib_delta.c b/devel/got/files/patch-lib_delta.c deleted file mode 100644 index 5ff416b141d7..000000000000 --- a/devel/got/files/patch-lib_delta.c +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/delta.c.orig 2025-07-26 10:40:07 UTC -+++ lib/delta.c -@@ -321,7 +321,8 @@ got_delta_apply_in_mem(uint8_t *base_buf, size_t base_ - if (err == NULL && *outsize != result_size) - err = got_error_fmt(GOT_ERR_BAD_DELTA, - "delta application result size mismatch: actual: %zd " -- "expected: %llu", *outsize, result_size); -+ "expected: %llu", *outsize, -+ (unsigned long long)result_size); - - return err; - } -@@ -390,7 +391,8 @@ got_delta_apply(FILE *base_file, const uint8_t *delta_ - if (err == NULL && *outsize != result_size) - err = got_error_fmt(GOT_ERR_BAD_DELTA, - "delta application result size mismatch: actual: %zd " -- "expected: %llu", *outsize, result_size); -+ "expected: %llu", *outsize, -+ (unsigned long long)result_size); - - if (memstream != NULL) { - if (fclose(memstream) == EOF && err == NULL) |