From patchwork Sun Aug 18 20:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11099947 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E7071399 for ; Sun, 18 Aug 2019 20:06:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61A8528382 for ; Sun, 18 Aug 2019 20:06:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5666B284DB; Sun, 18 Aug 2019 20:06:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A10127C2D for ; Sun, 18 Aug 2019 20:06:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727282AbfHRUF7 (ORCPT ); Sun, 18 Aug 2019 16:05:59 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:58050 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727259AbfHRUFz (ORCPT ); Sun, 18 Aug 2019 16:05:55 -0400 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:81dd:eb9b:e758:604b]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 5F6D36077F; Sun, 18 Aug 2019 20:05:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1566158753; bh=7PrtDxSwYxieVOiScyuB0DhFy4WJXixaEjwM8oLJjec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=cgsbZQZtXKqu9xdhrdfSer9WOdp3e+Bh9C2Dgg7AzT4CmTFFhxX5KYGrkxs1/FoDi MsKDqkWGEwoOMviEsTxQAl6J7ppfAVAp846mCHrJad/Y/2/cohNeltBkv6eoZ5lxfd +LrfDKzp7wnMkcBNoTEKCg8IhR3nMTz3jDfm4WLgJDUg1+Q+sU8MY4KrpPJ4pUdaru vz/B7N5aIPE1xUL8lXzALQBlPXawycxilPHKEYFiQIsYQVM+fHqZq8n1sZIZSXzsG5 8mNoKPHuYoSCZraZ0KbBzPiDN8pZm52LgKIuRwJi9oCJgR0woradtSxbt6uS5DhCEw NircOOWyWBufvfPoK/3zmK4M9245PPZ34KGHdmHAsj3wdikPYp3kEUj8XQUJ++k2ZL GO0vdyQC0wT2wTt8wML6q4TP2S+VVxJex8pEQQPWZXx9cTnJLtM8lr5kEWxTWtZ2Jg fJX/ALd+drevJg1V3NM8LhUHMA4w/dagfXtSpWA6DIOJU/PAj+5 From: "brian m. carlson" To: Cc: Taylor Blau , Derrick Stolee Subject: [PATCH 24/26] rerere: replace sha1_to_hex Date: Sun, 18 Aug 2019 20:04:25 +0000 Message-Id: <20190818200427.870753-25-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.23.0.rc1.170.gbd704faa3e In-Reply-To: <20190818200427.870753-1-sandals@crustytoothpaste.net> References: <20190818200427.870753-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace the uses of sha1_to_hex in this function with hash_to_hex to allow the use of SHA-256 as well. Rename a variable since it is no longer limited to SHA-1. Signed-off-by: brian m. carlson --- rerere.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rerere.c b/rerere.c index 17abb47321..3e51fdfe58 100644 --- a/rerere.c +++ b/rerere.c @@ -52,7 +52,7 @@ static void free_rerere_id(struct string_list_item *item) static const char *rerere_id_hex(const struct rerere_id *id) { - return sha1_to_hex(id->collection->hash); + return hash_to_hex(id->collection->hash); } static void fit_variant(struct rerere_dir *rr_dir, int variant) @@ -115,7 +115,7 @@ static int is_rr_file(const char *name, const char *filename, int *variant) static void scan_rerere_dir(struct rerere_dir *rr_dir) { struct dirent *de; - DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->hash))); + DIR *dir = opendir(git_path("rr-cache/%s", hash_to_hex(rr_dir->hash))); if (!dir) return; @@ -186,9 +186,9 @@ static struct rerere_id *new_rerere_id_hex(char *hex) return id; } -static struct rerere_id *new_rerere_id(unsigned char *sha1) +static struct rerere_id *new_rerere_id(unsigned char *hash) { - return new_rerere_id_hex(sha1_to_hex(sha1)); + return new_rerere_id_hex(hash_to_hex(hash)); } /*