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=1.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,LIST_MIRROR_RECEIVED,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no 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 767FA1F953 for ; Fri, 4 Feb 2022 23:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356789AbiBDXss (ORCPT ); Fri, 4 Feb 2022 18:48:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345783AbiBDXsp (ORCPT ); Fri, 4 Feb 2022 18:48:45 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7D23E0090B8 for ; Fri, 4 Feb 2022 15:48:43 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso4644054wms.4 for ; Fri, 04 Feb 2022 15:48:43 -0800 (PST) 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=dK5jNmVJ4rq+0btDdbLjErBgSAghCq4PC5Gnh2GK+tM=; b=hAtdivS8ZcT9YwnBIvNLVPinYljJUKCDd8r8Prrz2NOvd1j5a9OgHVNh3JgsCdR7Zf omB10L1LVO9qVv8iOjx/rEv3LkW7vVOvCNV1d2oZKI+MuCYuLtUYoznRX/4o0o28l5jr LChkZ+huddElUla9pFHmsqhQOB9dRJGF6p5bTiFBcooFHvCNoS6XauxeuK7n4L5+K2EB AVnbrUoKtStiMgSlVAQ3Y0RDecbd4hKziCYH75MHvpGn2Bin4vNrA/JDJycs/fw1l3yT 4AfEIVFX7/kjtB+tTSa4g39EDC1+m+cAxBcENIGUls7RpBd91oiwLMhdPtBBkiE2jVWM gxGg== 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=dK5jNmVJ4rq+0btDdbLjErBgSAghCq4PC5Gnh2GK+tM=; b=MlySN8rSy6ZDmtmUIwZzSAr3iTX1twrpvu/WsVzAJkq48FIcpRRdpypsQq5+dP0/cS YFh0reGyeYxte7eizCiETh75E5UCBKAwjLYCL+qnvXOZFVZZUe2HCxPKWdI4rgfbC06g sjPkNr45tJNwGr/hwQJjw4uxBiApXnbrmCUYY+j13eA3ZASr5RayotAcVQj/nN2DqjLu OwF0niIp+mqYJI5+dss+Gsl2WUl93/e+kUSKQrLA7QMJPkD+Or7b+lf+kAQS9ghtglYN dSkzltLNHWnKAYgCECmAdPNYJxq+WwddnXGuT6EPs4iEa6S/WCk7GEiW352wcUHh6UTJ TaMA== X-Gm-Message-State: AOAM5323A2+IVdvRT1B4mTtKqFrOGXbzrcxkAQfby41L36AtgepNOI2z B/WpOiFmeE9bEuPojUWWA25dFMZzSCQ+CQ== X-Google-Smtp-Source: ABdhPJxeAH+I2p0tHyrBpS0+77KxJ2NzO3s+PN6Vg8eJ2nC9nqliSbxKjGJrRCKLye0HY23xnY9lKg== X-Received: by 2002:a05:600c:154f:: with SMTP id f15mr871669wmg.111.1644018522132; Fri, 04 Feb 2022 15:48:42 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id t16sm2724042wmq.21.2022.02.04.15.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 15:48:41 -0800 (PST) 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 , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 02/12] object-file API: return "void", not "int" from hash_object_file() Date: Sat, 5 Feb 2022 00:48:24 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.940.ge7a5b4b05f2 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 The hash_object_file() function added in abdc3fc8421 (Add hash_sha1_file(), 2006-10-14) did not have a meaningful return value, and it never has. One was seemingly added to avoid adding braces to the "ret = " assignments being modified here. Let's instead assign "0" to the "ret" variables at the beginning of the relevant functions, and have them return "void". Signed-off-by: Ævar Arnfjörð Bjarmason --- object-file.c | 16 ++++++++-------- object-store.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/object-file.c b/object-file.c index ecc77973292..eeb6814780a 100644 --- a/object-file.c +++ b/object-file.c @@ -1836,14 +1836,13 @@ static int write_buffer(int fd, const void *buf, size_t len) return 0; } -int hash_object_file(const struct git_hash_algo *algo, const void *buf, +void hash_object_file(const struct git_hash_algo *algo, const void *buf, unsigned long len, const char *type, struct object_id *oid) { char hdr[MAX_HEADER_LEN]; int hdrlen = sizeof(hdr); write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen); - return 0; } /* Finalize a file on disk, and close it. */ @@ -2118,7 +2117,7 @@ static int index_mem(struct index_state *istate, enum object_type type, const char *path, unsigned flags) { - int ret; + int ret = 0; int re_allocated = 0; int write_object = flags & HASH_WRITE_OBJECT; @@ -2148,8 +2147,9 @@ static int index_mem(struct index_state *istate, if (write_object) ret = write_object_file(buf, size, type_name(type), oid); else - ret = hash_object_file(the_hash_algo, buf, size, - type_name(type), oid); + hash_object_file(the_hash_algo, buf, size, type_name(type), + oid); + if (re_allocated) free(buf); return ret; @@ -2161,7 +2161,7 @@ static int index_stream_convert_blob(struct index_state *istate, const char *path, unsigned flags) { - int ret; + int ret = 0; const int write_object = flags & HASH_WRITE_OBJECT; struct strbuf sbuf = STRBUF_INIT; @@ -2175,8 +2175,8 @@ static int index_stream_convert_blob(struct index_state *istate, ret = write_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB), oid); else - ret = hash_object_file(the_hash_algo, sbuf.buf, sbuf.len, - type_name(OBJ_BLOB), oid); + hash_object_file(the_hash_algo, sbuf.buf, sbuf.len, + type_name(OBJ_BLOB), oid); strbuf_release(&sbuf); return ret; } diff --git a/object-store.h b/object-store.h index 6f89482df03..44f6868cc9c 100644 --- a/object-store.h +++ b/object-store.h @@ -245,9 +245,9 @@ static inline void *repo_read_object_file(struct repository *r, /* Read and unpack an object file into memory, write memory to an object file */ int oid_object_info(struct repository *r, const struct object_id *, unsigned long *); -int hash_object_file(const struct git_hash_algo *algo, const void *buf, - unsigned long len, const char *type, - struct object_id *oid); +void hash_object_file(const struct git_hash_algo *algo, const void *buf, + unsigned long len, const char *type, + struct object_id *oid); int write_object_file_flags(const void *buf, unsigned long len, const char *type, struct object_id *oid, -- 2.35.1.940.ge7a5b4b05f2