From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 577A31F8C4 for ; Sat, 19 Mar 2022 00:24:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241666AbiCSAZR (ORCPT ); Fri, 18 Mar 2022 20:25:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241655AbiCSAZA (ORCPT ); Fri, 18 Mar 2022 20:25:00 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0B9712926C for ; Fri, 18 Mar 2022 17:23:39 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id r64so5655093wmr.4 for ; Fri, 18 Mar 2022 17:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=433nM0/Kve+428jQGk6NayhFLHvEIFtvBYsXuzgmexw=; b=Ew3RKK6xzpFNwuoukQr5ox7SnESUDFVhBH3zsjJZmmrPkGbQKdzt5k5IKnSukqeR99 Vsmcp50TGhXR5pjc2nrq3otSE002Nn6Xt/6N6rs6n4yGoGoWdGjEaTh4RqTng32NiV7F /GfbyXlzXP+r42ucM/ZhlR63WilXGi4FYFLJKkd8ZCfSHr4wbfDbjd9/eEEH+4WDfQVL iFLKLodELOpHkQedlojqkzLVfHA5gkxsMJNLTQX6XNwA8aMD+1Sg2tuUC9tj/IK9eozp Nlcbhe9e6XAQ7bISHhaGWu31uDY1IqhydLbdZyK3NXUoDhB3zddc0CL5hHpEWrIeLiyM 305Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=433nM0/Kve+428jQGk6NayhFLHvEIFtvBYsXuzgmexw=; b=XEDMdAWCAz9tG/VhQG/cdmJsAm88pycaZgQS4MFiPFEi/N1CnOM2EMxo+cl50S6mPQ L9gWDdsQdW5UXLXGlvY6mCDuStVtW8w0mOukeqU+ZTCwraEU/8u3BtGQKDL8wr3i/qt+ lIzR+rKIgLLoDpzwdk5IBOIpEHUylPmk03Tsp8U1yVG9a74jNBc0NKTomp4y3vtFWlVs PFJU6fSp//eNEsyunCMIJhTubVtchL0g0n3yEPyYko7NR7YybmHP4YwKmIJx8qVTpcUZ KBIBFpP4TXHEPxTQ27Z2tG0wnA0+cmxrjKDLQF/KXzGb5gu3IE+h1Oi91pEj0HBBiiQH 2Gzg== X-Gm-Message-State: AOAM53110vqjQ1umCQ93xc7D2IaqHoA1CT3ZRx81NUpywWZVTFGC4+MA UEw0sH6jrCkHHGL/gHZREeh6RYE0NvLHPA== X-Google-Smtp-Source: ABdhPJwzK0ZOTqrvPvil2QRZji7VendxU2hGSkEVFHB3VY0z9JwYlBLkD7NrGjaDdIeuVHwOYYtyKA== X-Received: by 2002:a05:600c:42c1:b0:389:8310:1128 with SMTP id j1-20020a05600c42c100b0038983101128mr10119779wme.3.1647649418337; Fri, 18 Mar 2022 17:23:38 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id u25-20020a05600c211900b00389d4bdb3d2sm14865519wml.36.2022.03.18.17.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 17:23:37 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Han Xin , Jiang Xin , =?UTF-8?q?Ren=C3=A9=20Scharfe?= , Derrick Stolee , Philip Oakley , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v11 4/8] object-file.c: factor out deflate part of write_loose_object() Date: Sat, 19 Mar 2022 01:23:21 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1438.g8874c8eeb35 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Split out the part of write_loose_object() that deals with calling git_deflate() into a utility function, a subsequent commit will introduce another function that'll make use of it. Signed-off-by: Ævar Arnfjörð Bjarmason --- object-file.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/object-file.c b/object-file.c index 4fcaf7a36ce..b66dc24e4b8 100644 --- a/object-file.c +++ b/object-file.c @@ -1992,6 +1992,28 @@ static int start_loose_object_common(struct strbuf *tmp_file, return fd; } +/** + * Common steps for the inner git_deflate() loop for writing loose + * objects. Returns what git_deflate() returns. + */ +static int write_loose_object_common(git_hash_ctx *c, + git_zstream *stream, const int flush, + unsigned char *in0, const int fd, + unsigned char *compressed, + const size_t compressed_len) +{ + int ret; + + ret = git_deflate(stream, flush ? Z_FINISH : 0); + the_hash_algo->update_fn(c, in0, stream->next_in - in0); + if (write_buffer(fd, compressed, stream->next_out - compressed) < 0) + die(_("unable to write loose object file")); + stream->next_out = compressed; + stream->avail_out = compressed_len; + + return ret; +} + /** * Common steps for loose object writers to end writing loose objects: * @@ -2049,12 +2071,9 @@ static int write_loose_object(const struct object_id *oid, char *hdr, stream.avail_in = len; do { unsigned char *in0 = stream.next_in; - ret = git_deflate(&stream, Z_FINISH); - the_hash_algo->update_fn(&c, in0, stream.next_in - in0); - if (write_buffer(fd, compressed, stream.next_out - compressed) < 0) - die(_("unable to write loose object file")); - stream.next_out = compressed; - stream.avail_out = sizeof(compressed); + + ret = write_loose_object_common(&c, &stream, 1, in0, fd, + compressed, sizeof(compressed)); } while (ret == Z_OK); end_loose_object_common(fd, ret, &c, &stream, ¶no_oid, oid, -- 2.35.1.1438.g8874c8eeb35