git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 04/17] Name local variables more consistently

From
mhagger@alum.mit.edu <mhagger@alum.mit.edu>
Date
Aug 25, 2012, 06:44 UTC
Message-ID
<1345877067-11841-5-git-send-email-mhagger@alum.mit.edu>
In-Reply-To
<1345877067-11841-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>

Use the names (nr_heads, heads) consistently across functions, instead of sometimes naming the same values (nr_match, match).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 builtin/fetch-pack.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index cc21047..76288a2 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -521,27 +521,27 @@ static void mark_recent_complete_commits(unsigned long cutoff)
 	}
 }
 
-static void filter_refs(struct ref **refs, int nr_match, char **match)
+static void filter_refs(struct ref **refs, int nr_heads, char **heads)
 {
 	struct ref **return_refs;
 	struct ref *newlist = NULL;
 	struct ref **newtail = &newlist;
 	struct ref *ref, *next;
 	struct ref *fastarray[32];
-	int match_pos;
+	int head_pos;
 
-	if (nr_match && !args.fetch_all) {
-		if (ARRAY_SIZE(fastarray) < nr_match)
-			return_refs = xcalloc(nr_match, sizeof(struct ref *));
+	if (nr_heads && !args.fetch_all) {
+		if (ARRAY_SIZE(fastarray) < nr_heads)
+			return_refs = xcalloc(nr_heads, sizeof(struct ref *));
 		else {
 			return_refs = fastarray;
-			memset(return_refs, 0, sizeof(struct ref *) * nr_match);
+			memset(return_refs, 0, sizeof(struct ref *) * nr_heads);
 		}
 	}
 	else
 		return_refs = NULL;
 
-	match_pos = 0;
+	head_pos = 0;
 	for (ref = *refs; ref; ref = next) {
 		next = ref->next;
 		if (!memcmp(ref->name, "refs/", 5) &&
@@ -556,17 +556,17 @@ static void filter_refs(struct ref **refs, int nr_match, char **match)
 		}
 		else {
 			int cmp = -1;
-			while (match_pos < nr_match) {
-				cmp = strcmp(ref->name, match[match_pos]);
+			while (head_pos < nr_heads) {
+				cmp = strcmp(ref->name, heads[head_pos]);
 				if (cmp < 0) /* definitely do not have it */
 					break;
 				else if (cmp == 0) { /* definitely have it */
-					match[match_pos][0] = '\0';
-					return_refs[match_pos] = ref;
+					heads[head_pos][0] = '\0';
+					return_refs[head_pos] = ref;
 					break;
 				}
 				else /* might have it; keep looking */
-					match_pos++;
+					head_pos++;
 			}
 			if (!cmp)
 				continue; /* we will link it later */
@@ -576,7 +576,7 @@ static void filter_refs(struct ref **refs, int nr_match, char **match)
 
 	if (!args.fetch_all) {
 		int i;
-		for (i = 0; i < nr_match; i++) {
+		for (i = 0; i < nr_heads; i++) {
 			ref = return_refs[i];
 			if (ref) {
 				*newtail = ref;
@@ -595,7 +595,7 @@ static void mark_alternate_complete(const struct ref *ref, void *unused)
 	mark_complete(NULL, ref->old_sha1, 0, NULL);
 }
 
-static int everything_local(struct ref **refs, int nr_match, char **match)
+static int everything_local(struct ref **refs, int nr_heads, char **heads)
 {
 	struct ref *ref;
 	int retval;
@@ -646,7 +646,7 @@ static int everything_local(struct ref **refs, int nr_match, char **match)
 		}
 	}
 
-	filter_refs(refs, nr_match, match);
+	filter_refs(refs, nr_heads, heads);
 
 	for (retval = 1, ref = *refs; ref ; ref = ref->next) {
 		const unsigned char *remote = ref->old_sha1;
@@ -777,8 +777,7 @@ static int get_pack(int xd[2], char **pack_lockfile)
 
 static struct ref *do_fetch_pack(int fd[2],
 		const struct ref *orig_ref,
-		int nr_match,
-		char **match,
+		int nr_heads, char **heads,
 		char **pack_lockfile)
 {
 	struct ref *ref = copy_ref_list(orig_ref);
@@ -819,7 +818,7 @@ static struct ref *do_fetch_pack(int fd[2],
 			fprintf(stderr, "Server supports ofs-delta\n");
 	} else
 		prefer_ofs_delta = 0;
-	if (everything_local(&ref, nr_match, match)) {
+	if (everything_local(&ref, nr_heads, heads)) {
 		packet_flush(fd[1]);
 		goto all_done;
 	}

-- 
1.7.11.3
Previous: mhagger@alum.mit.eduNext: mhagger@alum.mit.edu
Message 5 of 19 in “Clean up how fetch_pack() handles the heads list”
  1. 00/17 Clean up how fetch_pack() handles the heads listmhagger@alum.mit.edu, Aug 25, 2012
  2. 01/17 t5500: add tests of error output for missing refsmhagger@alum.mit.edu, Aug 25, 2012
  3. 02/17 Rename static function fetch_pack() to http_fetch_pack()mhagger@alum.mit.edu, Aug 25, 2012
  4. 03/17 Fix formatting.mhagger@alum.mit.edu, Aug 25, 2012
  5. 04/17 Name local variables more consistentlymhagger@alum.mit.edu, Aug 25, 2012
  6. 05/17 Do not check the same head_pos twicemhagger@alum.mit.edu, Aug 25, 2012
  7. 06/17 Let fetch_pack() inform caller about number of unique headsmhagger@alum.mit.edu, Aug 25, 2012
  8. 07/17 Pass nr_heads to do_pack_ref() by referencemhagger@alum.mit.edu, Aug 25, 2012
  9. 08/17 Pass nr_heads to everything_local() by referencemhagger@alum.mit.edu, Aug 25, 2012
  10. 09/17 Pass nr_heads to filter_refs() by referencemhagger@alum.mit.edu, Aug 25, 2012
  11. 10/17 Remove ineffective optimizationmhagger@alum.mit.edu, Aug 25, 2012
  12. 11/17 filter_refs(): do not leave gaps in return_refsmhagger@alum.mit.edu, Aug 25, 2012
  13. 12/17 filter_refs(): compress unmatched refs in heads arraymhagger@alum.mit.edu, Aug 25, 2012
  14. 13/17 cmd_fetch_pack: return early if finish_connect() returns an errormhagger@alum.mit.edu, Aug 25, 2012
  15. 14/17 Report missing refs even if no existing refs were receivedmhagger@alum.mit.edu, Aug 25, 2012
  16. 15/17 cmd_fetch_pack(): simplify computation of return valuemhagger@alum.mit.edu, Aug 25, 2012
  17. 16/17 fetch_pack(): free matching headsmhagger@alum.mit.edu, Aug 25, 2012
  18. 17/17 filter_refs(): simplify logicmhagger@alum.mit.edu, Aug 25, 2012
  19. Junio C HamanoAug 26, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.