git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Marco Costalba <mcostalba@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 02/11] Use new compress helpers in git files
Date: Sun, 03 Feb 2008 14:54:17 -0800	[thread overview]
Message-ID: <7vr6ftr6qu.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 1201952156-6764-2-git-send-email-mcostalba@gmail.com

Marco Costalba <mcostalba@gmail.com> writes:

> These are the 'easy' ones, where a signgle step
> compression is requested so that we can use only
> one call to compress_all()
>
> Signed-off-by: Marco Costalba <mcostalba@gmail.com>
> ---
>  archive-zip.c          |   28 +++-------------------------
>  builtin-pack-objects.c |   19 +++----------------
>  diff.c                 |   22 +++++-----------------
>  index-pack.c           |   20 +++-----------------
>  4 files changed, 14 insertions(+), 75 deletions(-)
>
> diff --git a/archive-zip.c b/archive-zip.c
> index 74e30f6..9071b86 100644
> --- a/archive-zip.c
> +++ b/archive-zip.c
> @@ -3,6 +3,7 @@
>   */
>  #include "cache.h"
>  #include "commit.h"
> +#include "compress.h"
>  #include "blob.h"
>  #include "tree.h"
>  #include "quote.h"
> @@ -97,33 +98,10 @@ static void copy_le32(unsigned char *dest, unsigned int n)
>  static void *zlib_deflate(void *data, unsigned long size,
>                            unsigned long *compressed_size)
>  {
> ...
> -	if (result != Z_STREAM_END) {
> -		free(buffer);
> -		return NULL;
> -	}
>  
> -	deflateEnd(&stream);
> -	*compressed_size = stream.total_out;
> +	unsigned char *buffer = NULL;
>  
> +	*compressed_size = compress_all(zlib_compression_level, data, size, &buffer);
>  	return buffer;
>  }

This used to leave *compressed_size untouched upon deflate
failure but now it sets it to zero.  Is this change in behaviour
safe?

  parent reply	other threads:[~2008-02-03 22:55 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-02 11:35 [PATCH 01/11] Introduce stream compress helpers Marco Costalba
2008-02-02 11:35 ` [PATCH 02/11] Use new compress helpers in git files Marco Costalba
2008-02-02 11:35   ` [PATCH 03/11] Use new compress helpers in fast-import Marco Costalba
2008-02-02 11:35     ` [PATCH 04/11] Use new compress helpers in http-push.c Marco Costalba
2008-02-02 11:35       ` [PATCH 05/11] Use new compress helpers in sha1_file.c Marco Costalba
2008-02-02 11:35         ` [PATCH 06/11] Better error handling in compress_all() Marco Costalba
2008-02-02 11:35           ` [PATCH 07/11] Introduce stream decompress helpers Marco Costalba
2008-02-02 11:35             ` [PATCH 08/11] Use new decompress_all() helper in git Marco Costalba
2008-02-02 11:35               ` [PATCH 09/11] Convert http-push.c and http-walker.c Marco Costalba
2008-02-02 11:35                 ` [PATCH 10/11] Convert builtin-pack/unpack Marco Costalba
2008-02-02 11:35                   ` [PATCH 11/11] Convert sha1_file.c to use decompress helpers Marco Costalba
2008-02-04  2:08                   ` [PATCH 10/11] Convert builtin-pack/unpack Junio C Hamano
2008-02-04  2:07               ` [PATCH 08/11] Use new decompress_all() helper in git Junio C Hamano
2008-02-04  2:07             ` [PATCH 07/11] Introduce stream decompress helpers Junio C Hamano
2008-02-03 22:54           ` [PATCH 06/11] Better error handling in compress_all() Junio C Hamano
2008-02-03 22:53       ` [PATCH 04/11] Use new compress helpers in http-push.c Junio C Hamano
2008-02-03 22:53     ` [PATCH 03/11] Use new compress helpers in fast-import Junio C Hamano
2008-02-04  1:48       ` Shawn O. Pearce
2008-02-04  1:41     ` Shawn O. Pearce
2008-02-03 22:54   ` Junio C Hamano [this message]
2008-02-03 22:53 ` [PATCH 01/11] Introduce stream compress helpers Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vr6ftr6qu.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=mcostalba@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).