All of lore.kernel.org
 help / color / mirror / Atom feed
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Patryk Obara" <patryk.obara@gmail.com>,
	"Jeff King" <peff@peff.net>,
	"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH 06/36] tree: convert read_tree_recursive to struct object_id
Date: Mon, 19 Feb 2018 22:58:57 +0000	[thread overview]
Message-ID: <20180219225927.386065-7-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20180219225927.386065-1-sandals@crustytoothpaste.net>

Convert the callback functions for read_tree_recursive to take a pointer
to struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 archive.c          |  8 ++++----
 builtin/checkout.c |  4 ++--
 builtin/log.c      |  2 +-
 builtin/ls-tree.c  |  8 ++++----
 merge-recursive.c  |  2 +-
 tree.c             | 14 +++++++-------
 tree.h             |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/archive.c b/archive.c
index 0b7b62af0c..e664cdb624 100644
--- a/archive.c
+++ b/archive.c
@@ -198,7 +198,7 @@ static int write_directory(struct archiver_context *c)
 	return ret ? -1 : 0;
 }
 
-static int queue_or_write_archive_entry(const unsigned char *sha1,
+static int queue_or_write_archive_entry(const struct object_id *oid,
 		struct strbuf *base, const char *filename,
 		unsigned mode, int stage, void *context)
 {
@@ -224,14 +224,14 @@ static int queue_or_write_archive_entry(const unsigned char *sha1,
 
 		if (check_attr_export_ignore(check))
 			return 0;
-		queue_directory(sha1, base, filename,
+		queue_directory(oid->hash, base, filename,
 				mode, stage, c);
 		return READ_TREE_RECURSIVE;
 	}
 
 	if (write_directory(c))
 		return -1;
-	return write_archive_entry(sha1, base->buf, base->len, filename, mode,
+	return write_archive_entry(oid->hash, base->buf, base->len, filename, mode,
 				   stage, context);
 }
 
@@ -303,7 +303,7 @@ static const struct archiver *lookup_archiver(const char *name)
 	return NULL;
 }
 
-static int reject_entry(const unsigned char *sha1, struct strbuf *base,
+static int reject_entry(const struct object_id *oid, struct strbuf *base,
 			const char *filename, unsigned mode,
 			int stage, void *context)
 {
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 191b96c49c..87182aa018 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -66,7 +66,7 @@ static int post_checkout_hook(struct commit *old, struct commit *new,
 
 }
 
-static int update_some(const unsigned char *sha1, struct strbuf *base,
+static int update_some(const struct object_id *oid, struct strbuf *base,
 		const char *pathname, unsigned mode, int stage, void *context)
 {
 	int len;
@@ -78,7 +78,7 @@ static int update_some(const unsigned char *sha1, struct strbuf *base,
 
 	len = base->len + strlen(pathname);
 	ce = xcalloc(1, cache_entry_size(len));
-	hashcpy(ce->oid.hash, sha1);
+	oidcpy(&ce->oid, oid);
 	memcpy(ce->name, base->buf, base->len);
 	memcpy(ce->name + base->len, pathname, len - base->len);
 	ce->ce_flags = create_ce_flags(0) | CE_UPDATE;
diff --git a/builtin/log.c b/builtin/log.c
index 94ee177d56..32a744bfd2 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -541,7 +541,7 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
 	return 0;
 }
 
-static int show_tree_object(const unsigned char *sha1,
+static int show_tree_object(const struct object_id *oid,
 		struct strbuf *base,
 		const char *pathname, unsigned mode, int stage, void *context)
 {
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index ef965408e8..c613dd7b82 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -60,7 +60,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
 	return 0;
 }
 
-static int show_tree(const unsigned char *sha1, struct strbuf *base,
+static int show_tree(const struct object_id *oid, struct strbuf *base,
 		const char *pathname, unsigned mode, int stage, void *context)
 {
 	int retval = 0;
@@ -94,7 +94,7 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
 			char size_text[24];
 			if (!strcmp(type, blob_type)) {
 				unsigned long size;
-				if (sha1_object_info(sha1, &size) == OBJ_BAD)
+				if (sha1_object_info(oid->hash, &size) == OBJ_BAD)
 					xsnprintf(size_text, sizeof(size_text),
 						  "BAD");
 				else
@@ -103,11 +103,11 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
 			} else
 				xsnprintf(size_text, sizeof(size_text), "-");
 			printf("%06o %s %s %7s\t", mode, type,
-			       find_unique_abbrev(sha1, abbrev),
+			       find_unique_abbrev(oid->hash, abbrev),
 			       size_text);
 		} else
 			printf("%06o %s %s\t", mode, type,
-			       find_unique_abbrev(sha1, abbrev));
+			       find_unique_abbrev(oid->hash, abbrev));
 	}
 	baselen = base->len;
 	strbuf_addstr(base, pathname);
diff --git a/merge-recursive.c b/merge-recursive.c
index 6ff971f9a2..c886f2e9cd 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -335,7 +335,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 	return result;
 }
 
-static int save_files_dirs(const unsigned char *sha1,
+static int save_files_dirs(const struct object_id *oid,
 		struct strbuf *base, const char *path,
 		unsigned int mode, int stage, void *context)
 {
diff --git a/tree.c b/tree.c
index b224115e0f..1a0f03f520 100644
--- a/tree.c
+++ b/tree.c
@@ -10,7 +10,7 @@
 const char *tree_type = "tree";
 
 static int read_one_entry_opt(struct index_state *istate,
-			      const unsigned char *sha1,
+			      const struct object_id *oid,
 			      const char *base, int baselen,
 			      const char *pathname,
 			      unsigned mode, int stage, int opt)
@@ -31,16 +31,16 @@ static int read_one_entry_opt(struct index_state *istate,
 	ce->ce_namelen = baselen + len;
 	memcpy(ce->name, base, baselen);
 	memcpy(ce->name + baselen, pathname, len+1);
-	hashcpy(ce->oid.hash, sha1);
+	oidcpy(&ce->oid, oid);
 	return add_index_entry(istate, ce, opt);
 }
 
-static int read_one_entry(const unsigned char *sha1, struct strbuf *base,
+static int read_one_entry(const struct object_id *oid, struct strbuf *base,
 			  const char *pathname, unsigned mode, int stage,
 			  void *context)
 {
 	struct index_state *istate = context;
-	return read_one_entry_opt(istate, sha1, base->buf, base->len, pathname,
+	return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
 				  mode, stage,
 				  ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
 }
@@ -49,12 +49,12 @@ static int read_one_entry(const unsigned char *sha1, struct strbuf *base,
  * This is used when the caller knows there is no existing entries at
  * the stage that will conflict with the entry being added.
  */
-static int read_one_entry_quick(const unsigned char *sha1, struct strbuf *base,
+static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base,
 				const char *pathname, unsigned mode, int stage,
 				void *context)
 {
 	struct index_state *istate = context;
-	return read_one_entry_opt(istate, sha1, base->buf, base->len, pathname,
+	return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
 				  mode, stage,
 				  ADD_CACHE_JUST_APPEND);
 }
@@ -83,7 +83,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
 				continue;
 		}
 
-		switch (fn(entry.oid->hash, base,
+		switch (fn(entry.oid, base,
 			   entry.path, entry.mode, stage, context)) {
 		case 0:
 			continue;
diff --git a/tree.h b/tree.h
index 744e6dc2ac..e2a80be4ef 100644
--- a/tree.h
+++ b/tree.h
@@ -27,7 +27,7 @@ void free_tree_buffer(struct tree *tree);
 struct tree *parse_tree_indirect(const struct object_id *oid);
 
 #define READ_TREE_RECURSIVE 1
-typedef int (*read_tree_fn_t)(const unsigned char *, struct strbuf *, const char *, unsigned int, int, void *);
+typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
 
 extern int read_tree_recursive(struct tree *tree,
 			       const char *base, int baselen,

  parent reply	other threads:[~2018-02-19 23:01 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-19 22:58 [PATCH 00/36] object_id part 12 brian m. carlson
2018-02-19 22:58 ` [PATCH 01/36] bulk-checkin: convert index_bulk_checkin to struct object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 02/36] builtin/write-tree: convert " brian m. carlson
2018-02-19 22:58 ` [PATCH 03/36] cache-tree: convert write_*_as_tree to object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 04/36] cache-tree: convert remnants to struct object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 05/36] resolve-undo: convert struct resolve_undo_info to object_id brian m. carlson
2018-02-19 22:58 ` brian m. carlson [this message]
2018-02-19 22:58 ` [PATCH 07/36] ref-filter: convert grab_objectname to struct object_id brian m. carlson
2018-02-19 22:58 ` [PATCH 08/36] strbuf: convert strbuf_add_unique_abbrev to use " brian m. carlson
2018-02-19 22:59 ` [PATCH 09/36] wt-status: convert struct wt_status_state to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 10/36] Convert find_unique_abbrev* to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 11/36] http-walker: convert struct object_request to use " brian m. carlson
2018-02-19 22:59 ` [PATCH 12/36] send-pack: convert remaining functions to " brian m. carlson
2018-02-19 22:59 ` [PATCH 13/36] replace_object: convert struct replace_object to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 14/36] builtin/mktag: convert to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 15/36] archive: convert write_archive_entry_fn_t to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 16/36] archive: convert sha1_file_to_archive to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 17/36] builtin/index-pack: convert struct ref_delta_entry to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 18/36] sha1_file: convert read_loose_object to use struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 19/36] sha1_file: convert check_sha1_signature to " brian m. carlson
2018-02-19 22:59 ` [PATCH 20/36] streaming: convert open_istream to use " brian m. carlson
2018-02-19 22:59 ` [PATCH 21/36] builtin/mktree: convert to " brian m. carlson
2018-02-19 22:59 ` [PATCH 22/36] sha1_file: convert assert_sha1_type to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 23/36] sha1_file: convert retry_bad_packed_offset to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 24/36] packfile: convert unpack_entry " brian m. carlson
2018-02-19 22:59 ` [PATCH 25/36] Convert remaining callers of sha1_object_info_extended to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 26/36] sha1_file: convert sha1_object_info* " brian m. carlson
2018-02-19 22:59 ` [PATCH 27/36] builtin/fmt-merge-msg: convert remaining code " brian m. carlson
2018-02-19 22:59 ` [PATCH 28/36] builtin/notes: convert static functions " brian m. carlson
2018-02-19 22:59 ` [PATCH 29/36] tree-walk: convert get_tree_entry_follow_symlinks internals " brian m. carlson
2018-02-19 22:59 ` [PATCH 30/36] streaming: convert istream internals to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 31/36] tree-walk: convert tree entry functions to object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 32/36] sha1_file: convert read_object_with_reference " brian m. carlson
2018-02-19 22:59 ` [PATCH 33/36] sha1_file: convert read_sha1_file to struct object_id brian m. carlson
2018-02-19 22:59 ` [PATCH 34/36] Convert lookup_replace_object " brian m. carlson
2018-02-19 22:59 ` [PATCH 35/36] sha1_file: introduce a constant for max header length brian m. carlson
2018-02-19 22:59 ` [PATCH 36/36] convert: convert to struct object_id brian m. carlson
2018-02-21 18:47 ` [PATCH 00/36] object_id part 12 Junio C Hamano
2018-02-22  0:24   ` 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=20180219225927.386065-7-sandals@crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=git@vger.kernel.org \
    --cc=patryk.obara@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.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.