git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: [PATCH 1/2] hex: drop sha1_to_hex_r()
Date: Mon, 11 Nov 2019 04:04:11 -0500	[thread overview]
Message-ID: <20191111090411.GA12545@sigill.intra.peff.net> (raw)
In-Reply-To: <20191111090332.GA2275@sigill.intra.peff.net>

There are no callers left; everybody uses oid_to_hex_r() or
hash_to_hex_algop_r(). This used to actually be the underlying
implementation for oid_to_hex_r(), but that's no longer the case since
47edb64997 (hex: introduce functions to print arbitrary hashes,
2018-11-14).

Let's get rid of it to de-clutter and to make sure nobody uses it.
Likewise we can drop the coccinelle rules that mention it, since the
compiler will make it quite clear that the code does not work.

Signed-off-by: Jeff King <peff@peff.net>
---
 cache.h                            |  1 -
 contrib/coccinelle/object_id.cocci | 17 -----------------
 hex.c                              |  5 -----
 3 files changed, 23 deletions(-)

diff --git a/cache.h b/cache.h
index 04cabaac11..6a4eb221b3 100644
--- a/cache.h
+++ b/cache.h
@@ -1462,7 +1462,6 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
  *   printf("%s -> %s", sha1_to_hex(one), sha1_to_hex(two));
  */
 char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *);
-char *sha1_to_hex_r(char *out, const unsigned char *sha1);
 char *oid_to_hex_r(char *out, const struct object_id *oid);
 char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *);	/* static buffer result! */
 char *sha1_to_hex(const unsigned char *sha1);						/* same static buffer */
diff --git a/contrib/coccinelle/object_id.cocci b/contrib/coccinelle/object_id.cocci
index 3e536a9834..6c0d21d8e2 100644
--- a/contrib/coccinelle/object_id.cocci
+++ b/contrib/coccinelle/object_id.cocci
@@ -25,23 +25,6 @@ struct object_id *OIDPTR;
 + oid_to_hex(OIDPTR)
   ...>}
 
-@@
-expression E;
-struct object_id OID;
-@@
-- sha1_to_hex_r(E, OID.hash)
-+ oid_to_hex_r(E, &OID)
-
-@@
-identifier f != oid_to_hex_r;
-expression E;
-struct object_id *OIDPTR;
-@@
-   f(...) {<...
-- sha1_to_hex_r(E, OIDPTR->hash)
-+ oid_to_hex_r(E, OIDPTR)
-  ...>}
-
 @@
 struct object_id OID;
 @@
diff --git a/hex.c b/hex.c
index 7850a8879d..8c3f06a192 100644
--- a/hex.c
+++ b/hex.c
@@ -90,11 +90,6 @@ char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,
 	return buffer;
 }
 
-char *sha1_to_hex_r(char *buffer, const unsigned char *sha1)
-{
-	return hash_to_hex_algop_r(buffer, sha1, &hash_algos[GIT_HASH_SHA1]);
-}
-
 char *oid_to_hex_r(char *buffer, const struct object_id *oid)
 {
 	return hash_to_hex_algop_r(buffer, oid->hash, the_hash_algo);
-- 
2.24.0.739.gb5632e4929


  reply	other threads:[~2019-11-11  9:04 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-11  9:03 [PATCH 0/2] getting rid of sha1_to_hex() Jeff King
2019-11-11  9:04 ` Jeff King [this message]
2019-11-11 18:30   ` [PATCH 1/2] hex: drop sha1_to_hex_r() Johannes Schindelin
2019-11-11  9:04 ` [PATCH 2/2] hex: drop sha1_to_hex() Jeff King
2019-11-11 14:18   ` SZEDER Gábor
2019-11-11 14:29     ` Jeff King
2019-11-12  4:13       ` Junio C Hamano
2019-11-12 10:57         ` Jeff King
2019-11-12 11:44           ` SZEDER Gábor
2019-11-12 12:12             ` Jeff King
2019-11-12 11:49           ` Junio C Hamano
2019-11-12 12:15             ` Jeff King
2019-11-13  1:09               ` Junio C Hamano
2019-11-13  1:15                 ` Jeff King
2019-11-11  9:09 ` [PATCH 0/2] getting rid of sha1_to_hex() Junio C Hamano
2019-11-11  9:21   ` Jeff King
2019-11-11 23:53     ` brian m. carlson

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=20191111090411.GA12545@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=sandals@crustytoothpaste.net \
    /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).