fast-export: move global "idents" anonymize hashmap into function

peff · gitster · commit 6416a865da44 · 2020-06-23T19:56:26.000-07:00
All of the other anonymization functions keep their static mappings
inside the function to avoid polluting the global namespace. Let's do
the same for "idents", as nobody needs it outside of
anonymize_ident_line().

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
@@ -555,7 +555,6 @@ static char *anonymize_commit_message(const char *old)
 	return xstrfmt("subject %d\n\nbody\n", counter++);
 }
 
-static struct hashmap idents;
 static char *anonymize_ident(const char *old, size_t len)
 {
 	static int counter;
@@ -572,6 +571,7 @@ static char *anonymize_ident(const char *old, size_t len)
  */
 static void anonymize_ident_line(const char **beg, const char **end)
 {
+	static struct hashmap idents;
 	static struct strbuf buffers[] = { STRBUF_INIT, STRBUF_INIT };
 	static unsigned which_buffer;
 

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,6 @@ static char anonymize_commit_message(const char old)`
`555`	`555`	`return xstrfmt("subject %d\n\nbody\n", counter++);`
`556`	`556`	`}`
`557`	`557`
`558`		`-static struct hashmap idents;`
`559`	`558`	`static char anonymize_ident(const char old, size_t len)`
`560`	`559`	`{`
`561`	`560`	`static int counter;`
`@@ -572,6 +571,7 @@ static char anonymize_ident(const char old, size_t len)`
`572`	`571`	`*/`
`573`	`572`	`static void anonymize_ident_line(const char beg, const char end)`
`574`	`573`	`{`
	`574`	`+ static struct hashmap idents;`
`575`	`575`	`static struct strbuf buffers[] = { STRBUF_INIT, STRBUF_INIT };`
`576`	`576`	`static unsigned which_buffer;`
`577`	`577`