Chirpy Software Public Git Repositories

Commit Diff

Commit:: bdf3f05ed09d141be02261c391d9e0a71c631e74
From:: Omar Polo <op@omarpolo.com>
Via:: Thomas Adam <thomas@xteddy.org>
Date:: Wed Aug 14 21:51:01 2024 UTC
Message:: rename idlen to digest_{,string_}len In my early sha256 work I've used `idlen' to parametrize the digest length, but that's ambiguous since it could refer either to the digest length (in binary form) or the digest _string_ length (hexadecimal). So, change the few offenders to either digest_len or digest_string_len, which is a "naming scheme" I've already used in the rest of the tree. ok stsp@
Actions:: Patch | Tree
commit - 57cafc2c8d2cc3945d19d99980c58a2b332db572
commit + bdf3f05ed09d141be02261c391d9e0a71c631e74
blob - b6b4541f9756fd1fc9eb3329cd32a375b2a4b874
blob + 251cdbaaf18885bef299a7edee1e4be43a305857
--- lib/got_lib_object_parse.h
+++ lib/got_lib_object_parse.h
@@ -31,7 +31,7 @@ struct got_parsed_tree_entry {
 	size_t namelen; /* strlen(name) */
 	mode_t mode; /* Mode parsed from tree buffer. */
 	uint8_t *id; /* Points to ID in parsed tree buffer. */
-	size_t idlen;
+	size_t digest_len;
 	int algo;
 };
 const struct got_error *got_object_parse_tree_entry(
blob - 0fa61f7ed7afc21da3e4d026ea817a0515de70c3
blob + d6225e5adf9ab9758646a0e40580dc931306c7f4
--- lib/object_open_io.c
+++ lib/object_open_io.c
@@ -566,7 +566,7 @@ open_tree(struct got_tree_object **tree,
 			err = got_error(GOT_ERR_NO_SPACE);
 			goto done;
 		}
-		memcpy(te->id.hash, pe->id, pe->idlen);
+		memcpy(te->id.hash, pe->id, pe->digest_len);
 		te->id.algo = pe->algo;
 		te->mode = pe->mode;
 		te->idx = i;
blob - 2694c4dbaee5c897f569305c0fee3236a04d5cf2
blob + 00ef12292ee99c13b11a184350a24f3e4abf2fdf
--- lib/object_parse.c
+++ lib/object_parse.c
@@ -762,7 +762,7 @@ got_object_tree_close(struct got_tree_object *tree)
 
 const struct got_error *
 got_object_parse_tree_entry(struct got_parsed_tree_entry *pte, size_t *elen,
-    char *buf, size_t maxlen, size_t idlen, enum got_hash_algorithm algo)
+    char *buf, size_t maxlen, size_t digest_len, enum got_hash_algorithm algo)
 {
 	char *p, *space;
 
@@ -786,16 +786,16 @@ got_object_parse_tree_entry(struct got_parsed_tree_ent
 		p++;
 	}
 
-	if (*elen > maxlen || maxlen - *elen < idlen)
+	if (*elen > maxlen || maxlen - *elen < digest_len)
 		return got_error(GOT_ERR_BAD_OBJ_DATA);
 
 	pte->name = space + 1;
 	pte->namelen = strlen(pte->name);
 	buf += *elen;
 	pte->id = buf;
-	pte->idlen = idlen;
+	pte->digest_len = digest_len;
 	pte->algo = algo;
-	*elen += idlen;
+	*elen += digest_len;
 	return NULL;
 }
 
blob - c56883ad0f91703cce8de8e4befd755c5431b45e
blob + 7eb2c8a99caefb269b150c01c90af12ab9e277c5
--- lib/pack.c
+++ lib/pack.c
@@ -75,12 +75,12 @@ got_packidx_init_hdr(struct got_packidx *p, int verify
 	struct got_packidx_v2_hdr *h;
 	struct got_hash ctx;
 	uint8_t hash[GOT_HASH_DIGEST_MAXLEN];
-	size_t nobj, len_fanout, len_ids, offset, remain, idlen;
+	size_t nobj, len_fanout, len_ids, offset, remain, digest_string_len;
 	ssize_t n;
 	int i;
 
 	got_hash_init(&ctx, p->algo);
-	idlen = got_hash_digest_length(p->algo);
+	digest_string_len = got_hash_digest_length(p->algo);
 
 	h = &p->hdr;
 	offset = 0;
@@ -300,31 +300,34 @@ got_packidx_init_hdr(struct got_packidx *p, int verify
 	offset += p->nlargeobj * sizeof(*h->large_offsets);
 
 checksum:
-	if (remain < idlen * 2) {
+	if (remain < digest_string_len * 2) {
 		err = got_error(GOT_ERR_BAD_PACKIDX);
 		goto done;
 	}
 	if (p->map) {
-		memcpy(h->trailer.packfile_hash, p->map + offset, idlen);
-		memcpy(h->trailer.packidx_hash, p->map + offset + idlen, idlen);
+		memcpy(h->trailer.packfile_hash, p->map + offset,
+		    digest_string_len);
+		memcpy(h->trailer.packidx_hash,
+		    p->map + offset + digest_string_len, digest_string_len);
 	} else {
-		n = read(p->fd, h->trailer.packfile_hash, idlen);
+		n = read(p->fd, h->trailer.packfile_hash, digest_string_len);
 		if (n < 0)
 			err = got_error_from_errno("read");
-		else if (n != idlen) {
+		else if (n != digest_string_len) {
 			err = got_error(GOT_ERR_BAD_PACKIDX);
 			goto done;
 		}
-		n = read(p->fd, h->trailer.packidx_hash, idlen);
+		n = read(p->fd, h->trailer.packidx_hash, digest_string_len);
 		if (n < 0)
 			err = got_error_from_errno("read");
-		else if (n != idlen) {
+		else if (n != digest_string_len) {
 			err = got_error(GOT_ERR_BAD_PACKIDX);
 			goto done;
 		}
 	}
 	if (verify) {
-		got_hash_update(&ctx, h->trailer.packfile_hash, idlen);
+		got_hash_update(&ctx, h->trailer.packfile_hash,
+		    digest_string_len);
 		got_hash_final(&ctx, hash);
 		if (got_hash_cmp(ctx.algo, hash, h->trailer.packidx_hash) != 0)
 			err = got_error(GOT_ERR_PACKIDX_CSUM);
blob - 56612f65cf49bd8d4a7391eadf3b9187f56b68ae
blob + 0a0080a069af4042d657c9e32643cfc47a716280
--- lib/privsep.c
+++ lib/privsep.c
@@ -1456,7 +1456,7 @@ send_tree_entries_batch(struct imsgbuf *ibuf,
 		struct got_parsed_tree_entry *pte = &entries[i];
 
 		/* Keep in sync with struct got_imsg_tree_entry definition! */
-		if (imsg_add(wbuf, pte->id, pte->idlen) == -1)
+		if (imsg_add(wbuf, pte->id, pte->digest_len) == -1)
 			return got_error_from_errno("imsg_add TREE_ENTRY");
 		if (pte->algo == GOT_HASH_SHA1 &&
 		    imsg_add(wbuf, gap, sizeof(gap)) == -1)
blob - e0465ec56e41f8213db9353f719842ac7cb59708
blob + e266e50151bd8f35ac2827c0c48bdc16561fa339
--- lib/reference.c
+++ lib/reference.c
@@ -297,10 +297,10 @@ parse_packed_ref_line(struct got_reference **ref, cons
 {
 	struct got_object_id id;
 	const char *name;
-	size_t idlen;
+	size_t digest_string_len;
 
 	*ref = NULL;
-	idlen = got_hash_digest_string_length(algo);
+	digest_string_len = got_hash_digest_string_length(algo);
 
 	if (line[0] == '#' || line[0] == '^')
 		return NULL;
@@ -309,11 +309,11 @@ parse_packed_ref_line(struct got_reference **ref, cons
 		return got_error(GOT_ERR_BAD_REF_DATA);
 
 	if (abs_refname) {
-		if (strcmp(line + idlen, abs_refname) != 0)
+		if (strcmp(line + digest_string_len, abs_refname) != 0)
 			return NULL;
 		name = abs_refname;
 	} else
-		name = line + idlen;
+		name = line + digest_string_len;
 
 	return alloc_ref(ref, name, &id, GOT_REF_IS_PACKED, mtime);
 }
blob - 9bddd3a51e1ec80f257cfd9ed273feb7625ab9c3
blob + 51f4532d94bf8d5b7cfcfad6123084e02a55f82f
--- lib/repository.c
+++ lib/repository.c
@@ -1193,17 +1193,17 @@ int
 got_repo_is_packidx_filename(const char *name, size_t len,
     enum got_hash_algorithm algo)
 {
-	size_t idlen;
+	size_t digest_string_len;
 
-	idlen = got_hash_digest_string_length(algo);
+	digest_string_len = got_hash_digest_string_length(algo);
 
-	if (len != GOT_PACKIDX_NAMELEN(idlen))
+	if (len != GOT_PACKIDX_NAMELEN(digest_string_len))
 		return 0;
 
 	if (strncmp(name, GOT_PACK_PREFIX, strlen(GOT_PACK_PREFIX)) != 0)
 		return 0;
 
-	if (strcmp(name + strlen(GOT_PACK_PREFIX) + idlen - 1,
+	if (strcmp(name + strlen(GOT_PACK_PREFIX) + digest_string_len - 1,
 	    GOT_PACKIDX_SUFFIX) != 0)
 		return 0;
 
blob - 095c6e3722f4069adb472d30b7e63cf5cc501a6c
blob + 325788b21bd4d9bdeadb462054ea0181f3832eb0
--- libexec/got-read-pack/got-read-pack.c
+++ libexec/got-read-pack/got-read-pack.c
@@ -451,7 +451,7 @@ tree_path_changed(int *changed, uint8_t **buf1, size_t
 	const struct got_error *err = NULL;
 	struct got_parsed_tree_entry pte1, pte2;
 	const char *seg, *s;
-	size_t seglen, idlen;
+	size_t seglen, digest_len;
 	size_t remain1 = *len1, remain2 = *len2, elen;
 	uint8_t *next_entry1 = *buf1;
 	uint8_t *next_entry2 = *buf2;
@@ -461,7 +461,7 @@ tree_path_changed(int *changed, uint8_t **buf1, size_t
 
 	*changed = 0;
 
-	idlen = got_hash_digest_length(pack->algo);
+	digest_len = got_hash_digest_length(pack->algo);
 
 	/* We not do support comparing the root path. */
 	if (got_path_is_root_dir(path))
@@ -493,7 +493,7 @@ tree_path_changed(int *changed, uint8_t **buf1, size_t
 		 */
 		while (remain1 > 0) {
 			err = got_object_parse_tree_entry(&pte1, &elen,
-			    next_entry1, remain1, idlen, pack->algo);
+			    next_entry1, remain1, digest_len, pack->algo);
 			if (err)
 				return err;
 			next_entry1 += elen;
@@ -517,7 +517,7 @@ tree_path_changed(int *changed, uint8_t **buf1, size_t
 
 		while (remain2 > 0) {
 			err = got_object_parse_tree_entry(&pte2, &elen,
-			    next_entry2, remain2, idlen, pack->algo);
+			    next_entry2, remain2, digest_len, pack->algo);
 			if (err)
 				return err;
 			next_entry2 += elen;
@@ -540,7 +540,7 @@ tree_path_changed(int *changed, uint8_t **buf1, size_t
 			break;
 		}
 
-		if (memcmp(pte1.id, pte2.id, pte1.idlen) == 0) {
+		if (memcmp(pte1.id, pte2.id, pte1.digest_len) == 0) {
 			*changed = 0;
 			break;
 		}
@@ -557,7 +557,7 @@ tree_path_changed(int *changed, uint8_t **buf1, size_t
 			struct got_object_id id1, id2;
 			int idx;
 
-			memcpy(id1.hash, pte1.id, pte1.idlen);
+			memcpy(id1.hash, pte1.id, pte1.digest_len);
 			id1.algo = pack->algo;
 			idx = got_packidx_get_object_idx(packidx, &id1);
 			if (idx == -1) {
@@ -574,7 +574,7 @@ tree_path_changed(int *changed, uint8_t **buf1, size_t
 			next_entry1 = *buf1;
 			remain1 = *len1;
 
-			memcpy(id2.hash, pte2.id, pte2.idlen);
+			memcpy(id2.hash, pte2.id, pte2.digest_len);
 			id2.algo = pack->algo;
 			idx = got_packidx_get_object_idx(packidx, &id2);
 			if (idx == -1) {
@@ -1277,7 +1277,7 @@ enumerate_tree(int *have_all_entries, struct imsgbuf *
 			if (err)
 				goto done;
 			eqid->id.algo = pte->algo;
-			memcpy(eqid->id.hash, pte->id, pte->idlen);
+			memcpy(eqid->id.hash, pte->id, pte->digest_len);
 
 			if (got_object_idset_contains(idset, &eqid->id)) {
 				got_object_qid_free(eqid);