{"thread":{"id":"13537","subject":"[PATCH] git-fast-import: rename cmd_*() functions to parse_*()","startedAt":"2008-05-15T22:35:56Z","lastAt":"2008-05-15T22:59:18Z","messageCount":2,"participants":["Miklos Vajna","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"77078","messageId":"1210890956-24068-1-git-send-email-vmiklos@frugalware.org","threadId":"13537","inReplyTo":null,"subject":"[PATCH] git-fast-import: rename cmd_*() functions to parse_*()","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-15T22:35:56Z","receivedAt":"2008-05-15T22:35:56Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"There is a cmd_merge() function in fast-import that will conflict with\nbuiltin-merge's cmd_merge() function. To keep it consistent, rename all\ncmd_*() function to parse_*()\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nI originally just wanted to rename cmd_merge() but Shawn suggested that\nthen renaming all functions and keeping consistency is a better\napproach, so here it is.\n\n fast-import.c |   62 ++++++++++++++++++++++++++++----------------------------\n 1 files changed, 31 insertions(+), 31 deletions(-)\n\ndiff --git a/fast-import.c b/fast-import.c\nindex 73e5439..caea684 100644\n--- a/fast-import.c\n+++ b/fast-import.c\n@@ -1690,7 +1690,7 @@ static void skip_optional_lf(void)\n \t\tungetc(term_char, stdin);\n }\n \n-static void cmd_mark(void)\n+static void parse_mark(void)\n {\n \tif (!prefixcmp(command_buf.buf, \"mark :\")) {\n \t\tnext_mark = strtoumax(command_buf.buf + 6, NULL, 10);\n@@ -1700,7 +1700,7 @@ static void cmd_mark(void)\n \t\tnext_mark = 0;\n }\n \n-static void cmd_data(struct strbuf *sb)\n+static void parse_data(struct strbuf *sb)\n {\n \tstrbuf_reset(sb);\n \n@@ -1798,13 +1798,13 @@ static char *parse_ident(const char *buf)\n \treturn ident;\n }\n \n-static void cmd_new_blob(void)\n+static void parse_new_blob(void)\n {\n \tstatic struct strbuf buf = STRBUF_INIT;\n \n \tread_next_command();\n-\tcmd_mark();\n-\tcmd_data(&buf);\n+\tparse_mark();\n+\tparse_data(&buf);\n \tstore_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);\n }\n \n@@ -1908,7 +1908,7 @@ static void file_change_m(struct branch *b)\n \t\t\tp = uq.buf;\n \t\t}\n \t\tread_next_command();\n-\t\tcmd_data(&buf);\n+\t\tparse_data(&buf);\n \t\tstore_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);\n \t} else if (oe) {\n \t\tif (oe->type != OBJ_BLOB)\n@@ -1995,7 +1995,7 @@ static void file_change_deleteall(struct branch *b)\n \tload_tree(&b->branch_tree);\n }\n \n-static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)\n+static void parse_from_commit(struct branch *b, char *buf, unsigned long size)\n {\n \tif (!buf || size < 46)\n \t\tdie(\"Not a valid commit: %s\", sha1_to_hex(b->sha1));\n@@ -2006,7 +2006,7 @@ static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)\n \t\tb->branch_tree.versions[1].sha1);\n }\n \n-static void cmd_from_existing(struct branch *b)\n+static void parse_from_existing(struct branch *b)\n {\n \tif (is_null_sha1(b->sha1)) {\n \t\thashclr(b->branch_tree.versions[0].sha1);\n@@ -2017,12 +2017,12 @@ static void cmd_from_existing(struct branch *b)\n \n \t\tbuf = read_object_with_reference(b->sha1,\n \t\t\tcommit_type, &size, b->sha1);\n-\t\tcmd_from_commit(b, buf, size);\n+\t\tparse_from_commit(b, buf, size);\n \t\tfree(buf);\n \t}\n }\n \n-static int cmd_from(struct branch *b)\n+static int parse_from(struct branch *b)\n {\n \tconst char *from;\n \tstruct branch *s;\n@@ -2053,12 +2053,12 @@ static int cmd_from(struct branch *b)\n \t\tif (oe->pack_id != MAX_PACK_ID) {\n \t\t\tunsigned long size;\n \t\t\tchar *buf = gfi_unpack_entry(oe, &size);\n-\t\t\tcmd_from_commit(b, buf, size);\n+\t\t\tparse_from_commit(b, buf, size);\n \t\t\tfree(buf);\n \t\t} else\n-\t\t\tcmd_from_existing(b);\n+\t\t\tparse_from_existing(b);\n \t} else if (!get_sha1(from, b->sha1))\n-\t\tcmd_from_existing(b);\n+\t\tparse_from_existing(b);\n \telse\n \t\tdie(\"Invalid ref name or SHA1 expression: %s\", from);\n \n@@ -2066,7 +2066,7 @@ static int cmd_from(struct branch *b)\n \treturn 1;\n }\n \n-static struct hash_list *cmd_merge(unsigned int *count)\n+static struct hash_list *parse_merge(unsigned int *count)\n {\n \tstruct hash_list *list = NULL, *n, *e = e;\n \tconst char *from;\n@@ -2107,7 +2107,7 @@ static struct hash_list *cmd_merge(unsigned int *count)\n \treturn list;\n }\n \n-static void cmd_new_commit(void)\n+static void parse_new_commit(void)\n {\n \tstatic struct strbuf msg = STRBUF_INIT;\n \tstruct branch *b;\n@@ -2124,7 +2124,7 @@ static void cmd_new_commit(void)\n \t\tb = new_branch(sp);\n \n \tread_next_command();\n-\tcmd_mark();\n+\tparse_mark();\n \tif (!prefixcmp(command_buf.buf, \"author \")) {\n \t\tauthor = parse_ident(command_buf.buf + 7);\n \t\tread_next_command();\n@@ -2135,10 +2135,10 @@ static void cmd_new_commit(void)\n \t}\n \tif (!committer)\n \t\tdie(\"Expected committer but didn't get one\");\n-\tcmd_data(&msg);\n+\tparse_data(&msg);\n \tread_next_command();\n-\tcmd_from(b);\n-\tmerge_list = cmd_merge(&merge_count);\n+\tparse_from(b);\n+\tmerge_list = parse_merge(&merge_count);\n \n \t/* ensure the branch is active/loaded */\n \tif (!b->branch_tree.tree || !max_active_branches) {\n@@ -2196,7 +2196,7 @@ static void cmd_new_commit(void)\n \tb->last_commit = object_count_by_type[OBJ_COMMIT];\n }\n \n-static void cmd_new_tag(void)\n+static void parse_new_tag(void)\n {\n \tstatic struct strbuf msg = STRBUF_INIT;\n \tchar *sp;\n@@ -2253,7 +2253,7 @@ static void cmd_new_tag(void)\n \n \t/* tag payload/message */\n \tread_next_command();\n-\tcmd_data(&msg);\n+\tparse_data(&msg);\n \n \t/* build the tag object */\n \tstrbuf_reset(&new_data);\n@@ -2273,7 +2273,7 @@ static void cmd_new_tag(void)\n \t\tt->pack_id = pack_id;\n }\n \n-static void cmd_reset_branch(void)\n+static void parse_reset_branch(void)\n {\n \tstruct branch *b;\n \tchar *sp;\n@@ -2293,12 +2293,12 @@ static void cmd_reset_branch(void)\n \telse\n \t\tb = new_branch(sp);\n \tread_next_command();\n-\tcmd_from(b);\n+\tparse_from(b);\n \tif (command_buf.len > 0)\n \t\tunread_command_buf = 1;\n }\n \n-static void cmd_checkpoint(void)\n+static void parse_checkpoint(void)\n {\n \tif (object_count) {\n \t\tcycle_packfile();\n@@ -2309,7 +2309,7 @@ static void cmd_checkpoint(void)\n \tskip_optional_lf();\n }\n \n-static void cmd_progress(void)\n+static void parse_progress(void)\n {\n \tfwrite(command_buf.buf, 1, command_buf.len, stdout);\n \tfputc('\\n', stdout);\n@@ -2449,17 +2449,17 @@ int main(int argc, const char **argv)\n \tset_die_routine(die_nicely);\n \twhile (read_next_command() != EOF) {\n \t\tif (!strcmp(\"blob\", command_buf.buf))\n-\t\t\tcmd_new_blob();\n+\t\t\tparse_new_blob();\n \t\telse if (!prefixcmp(command_buf.buf, \"commit \"))\n-\t\t\tcmd_new_commit();\n+\t\t\tparse_new_commit();\n \t\telse if (!prefixcmp(command_buf.buf, \"tag \"))\n-\t\t\tcmd_new_tag();\n+\t\t\tparse_new_tag();\n \t\telse if (!prefixcmp(command_buf.buf, \"reset \"))\n-\t\t\tcmd_reset_branch();\n+\t\t\tparse_reset_branch();\n \t\telse if (!strcmp(\"checkpoint\", command_buf.buf))\n-\t\t\tcmd_checkpoint();\n+\t\t\tparse_checkpoint();\n \t\telse if (!prefixcmp(command_buf.buf, \"progress \"))\n-\t\t\tcmd_progress();\n+\t\t\tparse_progress();\n \t\telse\n \t\t\tdie(\"Unsupported command: %s\", command_buf.buf);\n \t}\n-- \n1.5.5.1.211.g65ea3.dirty\n"},{"id":"77081","messageId":"20080515225918.GP29038@spearce.org","threadId":"13537","inReplyTo":"1210890956-24068-1-git-send-email-vmiklos@frugalware.org","subject":"Re: [PATCH] git-fast-import: rename cmd_*() functions to parse_*()","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-05-15T22:59:18Z","receivedAt":"2008-05-15T22:59:18Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Miklos Vajna <vmiklos@frugalware.org> wrote:\n> There is a cmd_merge() function in fast-import that will conflict with\n> builtin-merge's cmd_merge() function. To keep it consistent, rename all\n> cmd_*() function to parse_*()\n> \n> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>\n\nAcked-by: Shawn O. Pearce <spearce@spearce.org>\n\n> ---\n> \n> I originally just wanted to rename cmd_merge() but Shawn suggested that\n> then renaming all functions and keeping consistency is a better\n> approach, so here it is.\n> \n>  fast-import.c |   62 ++++++++++++++++++++++++++++----------------------------\n>  1 files changed, 31 insertions(+), 31 deletions(-)\n> \n> diff --git a/fast-import.c b/fast-import.c\n> index 73e5439..caea684 100644\n> --- a/fast-import.c\n> +++ b/fast-import.c\n> @@ -1690,7 +1690,7 @@ static void skip_optional_lf(void)\n>  \t\tungetc(term_char, stdin);\n>  }\n>  \n> -static void cmd_mark(void)\n> +static void parse_mark(void)\n>  {\n>  \tif (!prefixcmp(command_buf.buf, \"mark :\")) {\n>  \t\tnext_mark = strtoumax(command_buf.buf + 6, NULL, 10);\n> @@ -1700,7 +1700,7 @@ static void cmd_mark(void)\n>  \t\tnext_mark = 0;\n>  }\n>  \n> -static void cmd_data(struct strbuf *sb)\n> +static void parse_data(struct strbuf *sb)\n>  {\n>  \tstrbuf_reset(sb);\n>  \n> @@ -1798,13 +1798,13 @@ static char *parse_ident(const char *buf)\n>  \treturn ident;\n>  }\n>  \n> -static void cmd_new_blob(void)\n> +static void parse_new_blob(void)\n>  {\n>  \tstatic struct strbuf buf = STRBUF_INIT;\n>  \n>  \tread_next_command();\n> -\tcmd_mark();\n> -\tcmd_data(&buf);\n> +\tparse_mark();\n> +\tparse_data(&buf);\n>  \tstore_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);\n>  }\n>  \n> @@ -1908,7 +1908,7 @@ static void file_change_m(struct branch *b)\n>  \t\t\tp = uq.buf;\n>  \t\t}\n>  \t\tread_next_command();\n> -\t\tcmd_data(&buf);\n> +\t\tparse_data(&buf);\n>  \t\tstore_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);\n>  \t} else if (oe) {\n>  \t\tif (oe->type != OBJ_BLOB)\n> @@ -1995,7 +1995,7 @@ static void file_change_deleteall(struct branch *b)\n>  \tload_tree(&b->branch_tree);\n>  }\n>  \n> -static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)\n> +static void parse_from_commit(struct branch *b, char *buf, unsigned long size)\n>  {\n>  \tif (!buf || size < 46)\n>  \t\tdie(\"Not a valid commit: %s\", sha1_to_hex(b->sha1));\n> @@ -2006,7 +2006,7 @@ static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)\n>  \t\tb->branch_tree.versions[1].sha1);\n>  }\n>  \n> -static void cmd_from_existing(struct branch *b)\n> +static void parse_from_existing(struct branch *b)\n>  {\n>  \tif (is_null_sha1(b->sha1)) {\n>  \t\thashclr(b->branch_tree.versions[0].sha1);\n> @@ -2017,12 +2017,12 @@ static void cmd_from_existing(struct branch *b)\n>  \n>  \t\tbuf = read_object_with_reference(b->sha1,\n>  \t\t\tcommit_type, &size, b->sha1);\n> -\t\tcmd_from_commit(b, buf, size);\n> +\t\tparse_from_commit(b, buf, size);\n>  \t\tfree(buf);\n>  \t}\n>  }\n>  \n> -static int cmd_from(struct branch *b)\n> +static int parse_from(struct branch *b)\n>  {\n>  \tconst char *from;\n>  \tstruct branch *s;\n> @@ -2053,12 +2053,12 @@ static int cmd_from(struct branch *b)\n>  \t\tif (oe->pack_id != MAX_PACK_ID) {\n>  \t\t\tunsigned long size;\n>  \t\t\tchar *buf = gfi_unpack_entry(oe, &size);\n> -\t\t\tcmd_from_commit(b, buf, size);\n> +\t\t\tparse_from_commit(b, buf, size);\n>  \t\t\tfree(buf);\n>  \t\t} else\n> -\t\t\tcmd_from_existing(b);\n> +\t\t\tparse_from_existing(b);\n>  \t} else if (!get_sha1(from, b->sha1))\n> -\t\tcmd_from_existing(b);\n> +\t\tparse_from_existing(b);\n>  \telse\n>  \t\tdie(\"Invalid ref name or SHA1 expression: %s\", from);\n>  \n> @@ -2066,7 +2066,7 @@ static int cmd_from(struct branch *b)\n>  \treturn 1;\n>  }\n>  \n> -static struct hash_list *cmd_merge(unsigned int *count)\n> +static struct hash_list *parse_merge(unsigned int *count)\n>  {\n>  \tstruct hash_list *list = NULL, *n, *e = e;\n>  \tconst char *from;\n> @@ -2107,7 +2107,7 @@ static struct hash_list *cmd_merge(unsigned int *count)\n>  \treturn list;\n>  }\n>  \n> -static void cmd_new_commit(void)\n> +static void parse_new_commit(void)\n>  {\n>  \tstatic struct strbuf msg = STRBUF_INIT;\n>  \tstruct branch *b;\n> @@ -2124,7 +2124,7 @@ static void cmd_new_commit(void)\n>  \t\tb = new_branch(sp);\n>  \n>  \tread_next_command();\n> -\tcmd_mark();\n> +\tparse_mark();\n>  \tif (!prefixcmp(command_buf.buf, \"author \")) {\n>  \t\tauthor = parse_ident(command_buf.buf + 7);\n>  \t\tread_next_command();\n> @@ -2135,10 +2135,10 @@ static void cmd_new_commit(void)\n>  \t}\n>  \tif (!committer)\n>  \t\tdie(\"Expected committer but didn't get one\");\n> -\tcmd_data(&msg);\n> +\tparse_data(&msg);\n>  \tread_next_command();\n> -\tcmd_from(b);\n> -\tmerge_list = cmd_merge(&merge_count);\n> +\tparse_from(b);\n> +\tmerge_list = parse_merge(&merge_count);\n>  \n>  \t/* ensure the branch is active/loaded */\n>  \tif (!b->branch_tree.tree || !max_active_branches) {\n> @@ -2196,7 +2196,7 @@ static void cmd_new_commit(void)\n>  \tb->last_commit = object_count_by_type[OBJ_COMMIT];\n>  }\n>  \n> -static void cmd_new_tag(void)\n> +static void parse_new_tag(void)\n>  {\n>  \tstatic struct strbuf msg = STRBUF_INIT;\n>  \tchar *sp;\n> @@ -2253,7 +2253,7 @@ static void cmd_new_tag(void)\n>  \n>  \t/* tag payload/message */\n>  \tread_next_command();\n> -\tcmd_data(&msg);\n> +\tparse_data(&msg);\n>  \n>  \t/* build the tag object */\n>  \tstrbuf_reset(&new_data);\n> @@ -2273,7 +2273,7 @@ static void cmd_new_tag(void)\n>  \t\tt->pack_id = pack_id;\n>  }\n>  \n> -static void cmd_reset_branch(void)\n> +static void parse_reset_branch(void)\n>  {\n>  \tstruct branch *b;\n>  \tchar *sp;\n> @@ -2293,12 +2293,12 @@ static void cmd_reset_branch(void)\n>  \telse\n>  \t\tb = new_branch(sp);\n>  \tread_next_command();\n> -\tcmd_from(b);\n> +\tparse_from(b);\n>  \tif (command_buf.len > 0)\n>  \t\tunread_command_buf = 1;\n>  }\n>  \n> -static void cmd_checkpoint(void)\n> +static void parse_checkpoint(void)\n>  {\n>  \tif (object_count) {\n>  \t\tcycle_packfile();\n> @@ -2309,7 +2309,7 @@ static void cmd_checkpoint(void)\n>  \tskip_optional_lf();\n>  }\n>  \n> -static void cmd_progress(void)\n> +static void parse_progress(void)\n>  {\n>  \tfwrite(command_buf.buf, 1, command_buf.len, stdout);\n>  \tfputc('\\n', stdout);\n> @@ -2449,17 +2449,17 @@ int main(int argc, const char **argv)\n>  \tset_die_routine(die_nicely);\n>  \twhile (read_next_command() != EOF) {\n>  \t\tif (!strcmp(\"blob\", command_buf.buf))\n> -\t\t\tcmd_new_blob();\n> +\t\t\tparse_new_blob();\n>  \t\telse if (!prefixcmp(command_buf.buf, \"commit \"))\n> -\t\t\tcmd_new_commit();\n> +\t\t\tparse_new_commit();\n>  \t\telse if (!prefixcmp(command_buf.buf, \"tag \"))\n> -\t\t\tcmd_new_tag();\n> +\t\t\tparse_new_tag();\n>  \t\telse if (!prefixcmp(command_buf.buf, \"reset \"))\n> -\t\t\tcmd_reset_branch();\n> +\t\t\tparse_reset_branch();\n>  \t\telse if (!strcmp(\"checkpoint\", command_buf.buf))\n> -\t\t\tcmd_checkpoint();\n> +\t\t\tparse_checkpoint();\n>  \t\telse if (!prefixcmp(command_buf.buf, \"progress \"))\n> -\t\t\tcmd_progress();\n> +\t\t\tparse_progress();\n>  \t\telse\n>  \t\t\tdie(\"Unsupported command: %s\", command_buf.buf);\n>  \t}\n> -- \n> 1.5.5.1.211.g65ea3.dirty\n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n\n-- \nShawn.\n"}]}