From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Dec 2017 21:28:57 +0000 (-0800)
Subject: Merge branch 'ds/for-each-file-in-obj-micro-optim'
X-Git-Tag: v2.16.0-rc0~56
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/97e1f857fc8c7a9ba2b1179d58cc2b6b68a88437?hp=-c

Merge branch 'ds/for-each-file-in-obj-micro-optim'

The code to iterate over loose object files got optimized.

* ds/for-each-file-in-obj-micro-optim:
sha1_file: use strbuf_add() instead of strbuf_addf()
---

97e1f857fc8c7a9ba2b1179d58cc2b6b68a88437
diff --combined sha1_file.c
index b44f5247ca,2fc8fa93b4..3da70ac650
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -39,64 -39,6 +39,64 @@@ const struct object_id empty_blob_oid 
  	EMPTY_BLOB_SHA1_BIN_LITERAL
  };
  
 +static void git_hash_sha1_init(void *ctx)
 +{
 +	git_SHA1_Init((git_SHA_CTX *)ctx);
 +}
 +
 +static void git_hash_sha1_update(void *ctx, const void *data, size_t len)
 +{
 +	git_SHA1_Update((git_SHA_CTX *)ctx, data, len);
 +}
 +
 +static void git_hash_sha1_final(unsigned char *hash, void *ctx)
 +{
 +	git_SHA1_Final(hash, (git_SHA_CTX *)ctx);
 +}
 +
 +static void git_hash_unknown_init(void *ctx)
 +{
 +	die("trying to init unknown hash");
 +}
 +
 +static void git_hash_unknown_update(void *ctx, const void *data, size_t len)
 +{
 +	die("trying to update unknown hash");
 +}
 +
 +static void git_hash_unknown_final(unsigned char *hash, void *ctx)
 +{
 +	die("trying to finalize unknown hash");
 +}
 +
 +const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 +	{
 +		NULL,
 +		0x00000000,
 +		0,
 +		0,
 +		0,
 +		git_hash_unknown_init,
 +		git_hash_unknown_update,
 +		git_hash_unknown_final,
 +		NULL,
 +		NULL,
 +	},
 +	{
 +		"sha-1",
 +		/* "sha1", big-endian */
 +		0x73686131,
 +		sizeof(git_SHA_CTX),
 +		GIT_SHA1_RAWSZ,
 +		GIT_SHA1_HEXSZ,
 +		git_hash_sha1_init,
 +		git_hash_sha1_update,
 +		git_hash_sha1_final,
 +		&empty_tree_oid,
 +		&empty_blob_oid,
 +	},
 +};
 +
  /*
   * This is meant to hold a *small* number of objects that you would
   * want read_sha1_file() to be able to return, but yet you do not want
@@@ -1222,9 -1164,6 +1222,9 @@@ int sha1_object_info_extended(const uns
  				    lookup_replace_object(sha1) :
  				    sha1;
  
 +	if (is_null_sha1(real))
 +		return -1;
 +
  	if (!oi)
  		oi = &blank_oi;
  
@@@ -1964,7 -1903,6 +1964,6 @@@ int for_each_file_in_obj_subdir(unsigne
  	origlen = path->len;
  	strbuf_complete(path, '/');
  	strbuf_addf(path, "%02x", subdir_nr);
- 	baselen = path->len;
  
  	dir = opendir(path->buf);
  	if (!dir) {
@@@ -1975,15 -1913,18 +1974,18 @@@
  	}
  
  	oid.hash[0] = subdir_nr;
+ 	strbuf_addch(path, '/');
+ 	baselen = path->len;
  
  	while ((de = readdir(dir))) {
+ 		size_t namelen;
  		if (is_dot_or_dotdot(de->d_name))
  			continue;
  
+ 		namelen = strlen(de->d_name);
  		strbuf_setlen(path, baselen);
- 		strbuf_addf(path, "/%s", de->d_name);
- 
- 		if (strlen(de->d_name) == GIT_SHA1_HEXSZ - 2 &&
+ 		strbuf_add(path, de->d_name, namelen);
+ 		if (namelen == GIT_SHA1_HEXSZ - 2 &&
  		    !hex_to_bytes(oid.hash + 1, de->d_name,
  				  GIT_SHA1_RAWSZ - 1)) {
  			if (obj_cb) {
@@@ -2002,7 -1943,7 +2004,7 @@@
  	}
  	closedir(dir);
  
- 	strbuf_setlen(path, baselen);
+ 	strbuf_setlen(path, baselen - 1);
  	if (!r && subdir_cb)
  		r = subdir_cb(subdir_nr, path->buf, data);