[PATCH] index-pack: minor fixes to comment and function name

From

Nicolas Pitre <nico@cam.org>

Date

Oct 27, 2006, 20:14 UTC

Message-ID

<Pine.LNX.4.64.0610271609310.11384@xanadu.home>

Use proper english. Be more exact in one comment.

Signed-off-by: Nicolas Pitre <nico@cam.org>

---

diff --git a/index-pack.c b/index-pack.c
index 5c747a6..3a389c1 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -324,8 +324,8 @@ static int find_delta(const union delta_
         return -first-1;
 }
 
-static int find_delta_childs(const union delta_base *base,
-			     int *first_index, int *last_index)
+static int find_delta_children(const union delta_base *base,
+			       int *first_index, int *last_index)
 {
 	int first = find_delta(base);
 	int last = first;
@@ -389,7 +389,7 @@ static void resolve_delta(struct object_
 	nr_resolved_deltas++;
 
 	hashcpy(delta_base.sha1, delta_obj->sha1);
-	if (!find_delta_childs(&delta_base, &first, &last)) {
+	if (!find_delta_children(&delta_base, &first, &last)) {
 		for (j = first; j <= last; j++) {
 			struct object_entry *child = objects + deltas[j].obj_no;
 			if (child->real_type == OBJ_REF_DELTA)
@@ -399,7 +399,7 @@ static void resolve_delta(struct object_
 
 	memset(&delta_base, 0, sizeof(delta_base));
 	delta_base.offset = delta_obj->offset;
-	if (!find_delta_childs(&delta_base, &first, &last)) {
+	if (!find_delta_children(&delta_base, &first, &last)) {
 		for (j = first; j <= last; j++) {
 			struct object_entry *child = objects + deltas[j].obj_no;
 			if (child->real_type == OBJ_OFS_DELTA)
@@ -429,7 +429,7 @@ static void parse_pack_objects(unsigned
 	 * First pass:
 	 * - find locations of all objects;
 	 * - calculate SHA1 of all non-delta objects;
-	 * - remember base SHA1 for all deltas.
+	 * - remember base (SHA1 or offset) for all deltas.
 	 */
 	if (verbose)
 		fprintf(stderr, "Indexing %d objects.\n", nr_objects);
@@ -489,10 +489,10 @@ static void parse_pack_objects(unsigned
 		if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA)
 			continue;
 		hashcpy(base.sha1, obj->sha1);
-		ref = !find_delta_childs(&base, &ref_first, &ref_last);
+		ref = !find_delta_children(&base, &ref_first, &ref_last);
 		memset(&base, 0, sizeof(base));
 		base.offset = obj->offset;
-		ofs = !find_delta_childs(&base, &ofs_first, &ofs_last);
+		ofs = !find_delta_children(&base, &ofs_first, &ofs_last);
 		if (!ref && !ofs)
 			continue;
 		data = get_data_from_pack(obj);
@@ -615,7 +615,7 @@ static void fix_unresolved_deltas(int nr
 		else die("base object %s is of type '%s'",
 			 sha1_to_hex(d->base.sha1), type);
 
-		find_delta_childs(&d->base, &first, &last);
+		find_delta_children(&d->base, &first, &last);
 		for (j = first; j <= last; j++) {
 			struct object_entry *child = objects + deltas[j].obj_no;