All of lore.kernel.org
 help / color / mirror / Atom feed
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
	Michael Haggerty <mhagger@alum.mit.edu>,
	Junio C Hamano <gitster@pobox.com>,
	Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: [PATCH v4 16/19] sha1_file: introduce an nth_packed_object_oid function
Date: Mon, 20 Feb 2017 00:10:28 +0000	[thread overview]
Message-ID: <20170220001031.559931-17-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20170220001031.559931-1-sandals@crustytoothpaste.net>

There are places in the code where we would like to provide a struct
object_id *, yet read the hash directly from the pack.  Provide an
nth_packed_object_oid function that is similar to the
nth_packed_object_sha1 function.

In order to avoid a potentially invalid cast, nth_packed_object_oid
provides a variable into which to store the value, which it returns on
success; on error, it returns NULL, as nth_packed_object_sha1 does.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 cache.h     |  6 ++++++
 sha1_file.c | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/cache.h b/cache.h
index e03a672d15..29e59cbb56 100644
--- a/cache.h
+++ b/cache.h
@@ -1608,6 +1608,12 @@ extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
  * error.
  */
 extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
+/*
+ * Like nth_packed_object_sha1, but write the data into the object specified by
+ * the the first argument.  Returns the first argument on success, and NULL on
+ * error.
+ */
+extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
 
 /*
  * Return the offset of the nth object within the specified packfile.
diff --git a/sha1_file.c b/sha1_file.c
index ec957db5e1..777b8e8eae 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2628,6 +2628,17 @@ const unsigned char *nth_packed_object_sha1(struct packed_git *p,
 	}
 }
 
+const struct object_id *nth_packed_object_oid(struct object_id *oid,
+					      struct packed_git *p,
+					      uint32_t n)
+{
+	const unsigned char *hash = nth_packed_object_sha1(p, n);
+	if (!hash)
+		return NULL;
+	hashcpy(oid->hash, hash);
+	return oid;
+}
+
 void check_pack_index_ptr(const struct packed_git *p, const void *vptr)
 {
 	const unsigned char *ptr = vptr;
@@ -3788,13 +3799,13 @@ static int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn c
 	int r = 0;
 
 	for (i = 0; i < p->num_objects; i++) {
-		const unsigned char *sha1 = nth_packed_object_sha1(p, i);
+		struct object_id oid;
 
-		if (!sha1)
+		if (!nth_packed_object_oid(&oid, p, i))
 			return error("unable to get sha1 of object %u in %s",
 				     i, p->pack_name);
 
-		r = cb(sha1, p, i, data);
+		r = cb(oid.hash, p, i, data);
 		if (r)
 			break;
 	}
-- 
2.11.0


  parent reply	other threads:[~2017-02-20  0:10 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-20  0:10 [PATCH v4 00/19] object_id part 6 brian m. carlson
2017-02-20  0:10 ` [PATCH v4 01/19] hex: introduce parse_oid_hex brian m. carlson
2017-02-20  0:10 ` [PATCH v4 02/19] builtin/commit: convert to struct object_id brian m. carlson
2017-02-20  0:10 ` [PATCH v4 03/19] builtin/diff-tree: " brian m. carlson
2017-02-20  8:09   ` Jeff King
2017-02-21  0:25     ` brian m. carlson
2017-02-21  1:08       ` Jeff King
2017-02-21  1:10         ` brian m. carlson
2017-02-20  0:10 ` [PATCH v4 04/19] builtin/describe: " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 05/19] builtin/fast-export: " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 06/19] builtin/fmt-merge-message: " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 07/19] builtin/grep: " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 08/19] builtin/branch: " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 09/19] builtin/clone: " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 10/19] builtin/merge: " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 11/19] Convert remaining callers of resolve_refdup to object_id brian m. carlson
2017-02-20  0:10 ` [PATCH v4 12/19] builtin/replace: convert to struct object_id brian m. carlson
2017-02-20  0:10 ` [PATCH v4 13/19] reflog-walk: convert struct reflog_info " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 14/19] refs: convert each_reflog_ent_fn " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 15/19] refs: simplify parsing of reflog entries brian m. carlson
2017-02-20  0:10 ` brian m. carlson [this message]
2017-02-20  0:10 ` [PATCH v4 17/19] Convert object iteration callbacks to struct object_id brian m. carlson
2017-02-20  0:10 ` [PATCH v4 18/19] builtin/merge-base: convert " brian m. carlson
2017-02-20  0:10 ` [PATCH v4 19/19] wt-status: " 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=20170220001031.559931-17-sandals@crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.