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

[PATCH RFC v2 06/25] cat-file: split expand_atom() into 2 functions

From
Olga Telezhnaya <olyatelezhnaya@gmail.com>
Date
Feb 5, 2018, 11:27 UTC
Message-ID
<0102016165b8b42e-fdf2a584-b8e3-4279-bc69-eb9755a541e2-000000@eu-west-1.amazonses.com>
In-Reply-To
<0102016165b8b3c4-54efe4c4-6d19-435d-b5b9-6c727771353b-000000@eu-west-1.amazonses.com>

Split expand_atom() into 2 different functions, mark_atom_in_object_info() prepares variable for further filling, (new) expand_atom() creates resulting string. Need that for further reusing of formatting logic from ref-filter. Both functions will be step-by-step removed by the end of this patch.

Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored by: Jeff King <peff@peff.net>
---
 builtin/cat-file.c | 73 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 35 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 37d6096d201b5..edb04a96d9bd3 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -182,47 +182,47 @@ static int is_atom(const char *atom, const char *s, int slen)
 	return alen == slen && !memcmp(atom, s, alen);
 }
 
-static void expand_atom(struct strbuf *sb, const char *atom, int len,
-			void *vdata)
+static void mark_atom_in_object_info(const char *atom, int len,
+				     struct expand_data *data)
 {
-	struct expand_data *data = vdata;
+	if (is_atom("objectname", atom, len))
+		; /* do nothing */
+	else if (is_atom("objecttype", atom, len))
+		data->info.typep = &data->type;
+	else if (is_atom("objectsize", atom, len))
+		data->info.sizep = &data->size;
+	else if (is_atom("objectsize:disk", atom, len))
+		data->info.disk_sizep = &data->disk_size;
+	else if (is_atom("rest", atom, len))
+		data->split_on_whitespace = 1;
+	else if (is_atom("deltabase", atom, len))
+		data->info.delta_base_sha1 = data->delta_base_oid.hash;
+	else
+		die("unknown format element: %.*s", len, atom);
+}
 
-	if (is_atom("objectname", atom, len)) {
-		if (!data->mark_query)
-			strbuf_addstr(sb, oid_to_hex(&data->oid));
-	} else if (is_atom("objecttype", atom, len)) {
-		if (data->mark_query)
-			data->info.typep = &data->type;
-		else
-			strbuf_addstr(sb, typename(data->type));
-	} else if (is_atom("objectsize", atom, len)) {
-		if (data->mark_query)
-			data->info.sizep = &data->size;
-		else
-			strbuf_addf(sb, "%lu", data->size);
-	} else if (is_atom("objectsize:disk", atom, len)) {
-		if (data->mark_query)
-			data->info.disk_sizep = &data->disk_size;
-		else
-			strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size);
-	} else if (is_atom("rest", atom, len)) {
-		if (data->mark_query)
-			data->split_on_whitespace = 1;
-		else if (data->rest)
+static void expand_atom(struct strbuf *sb, const char *atom, int len,
+			 struct expand_data *data)
+{
+	if (is_atom("objectname", atom, len))
+		strbuf_addstr(sb, oid_to_hex(&data->oid));
+	else if (is_atom("objecttype", atom, len))
+		strbuf_addstr(sb, typename(data->type));
+	else if (is_atom("objectsize", atom, len))
+		strbuf_addf(sb, "%lu", data->size);
+	else if (is_atom("objectsize:disk", atom, len))
+		strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size);
+	else if (is_atom("rest", atom, len)) {
+		if (data->rest)
 			strbuf_addstr(sb, data->rest);
-	} else if (is_atom("deltabase", atom, len)) {
-		if (data->mark_query)
-			data->info.delta_base_sha1 = data->delta_base_oid.hash;
-		else
-			strbuf_addstr(sb,
-				      oid_to_hex(&data->delta_base_oid));
-	} else
-		die("unknown format element: %.*s", len, atom);
+	} else if (is_atom("deltabase", atom, len))
+		strbuf_addstr(sb, oid_to_hex(&data->delta_base_oid));
 }
 
-static size_t expand_format(struct strbuf *sb, const char *start, void *data)
+static size_t expand_format(struct strbuf *sb, const char *start, void *vdata)
 {
 	const char *end;
+	struct expand_data *data = vdata;
 
 	if (*start != '(')
 		return 0;
@@ -230,7 +230,10 @@ static size_t expand_format(struct strbuf *sb, const char *start, void *data)
 	if (!end)
 		die("format element '%s' does not end in ')'", start);
 
-	expand_atom(sb, start + 1, end - start - 1, data);
+	if (data->mark_query)
+		mark_atom_in_object_info(start + 1, end - start - 1, data);
+	else
+		expand_atom(sb, start + 1, end - start - 1, data);
 
 	return end - start + 1;
 }

--
https://github.com/git/git/pull/452
Previous: Olga TelezhnayaNext: Olga Telezhnaya
Message 6 of 26 in “ref-filter: get rid of goto”
  1. 01/25 ref-filter: get rid of gotoOlga Telezhnaya, Feb 5, 2018
  2. 08/25 ref-filter: reuse parse_ref_filter_atom()Olga Telezhnaya, Feb 5, 2018
  3. 05/25 cat-file: move struct expand_data into ref-filterOlga Telezhnaya, Feb 5, 2018
  4. 22/25 ref-filter: work with objectsize:diskOlga Telezhnaya, Feb 5, 2018
  5. 13/25 ref-filter: get rid of mark_atom_in_object_info()Olga Telezhnaya, Feb 5, 2018
  6. 06/25 cat-file: split expand_atom() into 2 functionsOlga Telezhnaya, Feb 5, 2018
  7. 16/25 cat-file: move skip_object_info into ref-filterOlga Telezhnaya, Feb 5, 2018
  8. 11/25 ref-filter: rename field in ref_array_item stuctOlga Telezhnaya, Feb 5, 2018
  9. 04/25 ref-filter: make valid_atom as function parameterOlga Telezhnaya, Feb 5, 2018
  10. 03/25 cat-file: reuse struct ref_formatOlga Telezhnaya, Feb 5, 2018
  11. 25/25 cat-file: update of docsOlga Telezhnaya, Feb 5, 2018
  12. 24/25 cat-file: tests for new atoms addedOlga Telezhnaya, Feb 5, 2018
  13. 15/25 ref_filter: add is_atom_used functionOlga Telezhnaya, Feb 5, 2018
  14. 10/25 ref-filter: make populate_value() globalOlga Telezhnaya, Feb 5, 2018
  15. 18/25 ref-filter: make valid_atom general againOlga Telezhnaya, Feb 5, 2018
  16. 02/25 ref-filter: add return value to some functionsOlga Telezhnaya, Feb 5, 2018
  17. 20/25 ref-filter: make populate_value() internal againOlga Telezhnaya, Feb 5, 2018
  18. 19/25 cat-file: reuse printing logic from ref-filterOlga Telezhnaya, Feb 5, 2018
  19. 12/25 cat-file: start reusing populate_value()Olga Telezhnaya, Feb 5, 2018
  20. 14/25 ref-filter: add is_cat flagOlga Telezhnaya, Feb 5, 2018
  21. Junio C HamanoFeb 5, 2018
  22. 21/25 ref-filter: unifying formatting of cat-file optsOlga Telezhnaya, Feb 5, 2018
  23. 09/25 cat-file: start use ref_array_item structOlga Telezhnaya, Feb 5, 2018
  24. 17/25 ref-filter: make cat_file_info independentOlga Telezhnaya, Feb 5, 2018
  25. 23/25 for-each-ref: tests for new atoms addedOlga Telezhnaya, Feb 5, 2018
  26. 07/25 cat-file: start migrating formatting to ref-filterOlga Telezhnaya, Feb 5, 2018

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.