git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/4] archive-zip: remove unneccesarry condition in write_zip_entry()

From
René Scharfe <l.s.r@web.de>
Date
Aug 7, 2025, 19:51 UTC
Message-ID
<7650da07-dd89-4e79-ac81-1c99f4700d9e@web.de>
In-Reply-To
<20250804-toon-archive-zip-fix-v1-2-ca89858e5eaa@iotcl.com>
On 8/4/25 6:56 PM, Toon Claes wrote:
Show 30 quoted lines
> The function write_or_die() can handle a length that's zero, thus we can
> remove the condition that checks the value of `out_len` that surrounds
> this call. The value shall never be negative as this would have caused
> data being omitted in the deflated output.
> 
> Co-authored-by: Justin Tobler <jltobler@gmail.com>
> Signed-off-by: Toon Claes <toon@iotcl.com>
> ---
>  archive-zip.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/archive-zip.c b/archive-zip.c
> index cc6d0cadd9..d41a12de5f 100644
> --- a/archive-zip.c
> +++ b/archive-zip.c
> @@ -478,11 +478,8 @@ static int write_zip_entry(struct archiver_args *args,
>  				die(_("deflate error (%d)"), result);
>  			out_len = zstream.next_out - compressed;
>  
> -			if (out_len > 0) {
> -				write_or_die(1, compressed, out_len);
> -				compressed_size += out_len;
> -			}
> -
> +			write_or_die(1, compressed, out_len);
> +			compressed_size += out_len;
>  		}
>  		close_istream(stream);
>  		if (readlen)
> 

OK, less lines again, great! write_or_die() handles out_len == 0 just fine; this won't increase the number of syscalls we make.

René
Previous: Toon ClaesNext: Toon Claes
Message 5 of 9 in “Fix archiving some corner-case files into zip”
  1. 0/4 Fix archiving some corner-case files into zipToon Claes, Aug 4, 2025
  2. 1/4 archive-zip: deduplicate code setting output buffer in write_zip_entry()Toon Claes, Aug 4, 2025
  3. René ScharfeAug 7, 2025
  4. 2/4 archive-zip: remove unneccesarry condition in write_zip_entry()Toon Claes, Aug 4, 2025
  5. René ScharfeAug 7, 2025
  6. 3/4 archive-zip: in write_zip_entry() call git_deflate() in a loopToon Claes, Aug 4, 2025
  7. René ScharfeAug 7, 2025
  8. 4/4 archive-zip: move git_deflate() with Z_FINISH into the loopToon Claes, Aug 4, 2025
  9. René ScharfeAug 7, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.