{"thread":{"id":"8523","subject":"[RFC][PATCH 06/10] Sparse: fix \"'add_head' not declared\" warning","startedAt":"2007-06-08T22:16:31Z","lastAt":"2007-06-08T22:16:31Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":10},"messages":[{"id":"44430","messageId":"4669D53F.5020206@ramsay1.demon.co.uk","threadId":"8523","inReplyTo":null,"subject":"[RFC][PATCH 06/10] Sparse: fix \"'add_head' not declared\" warning","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2007-06-08T22:16:31Z","receivedAt":"2007-06-08T22:16:31Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nThis function was defined in builtin-diff.c and also used in\nbuiltin-log.c. Since it has demonstrated its utility, move the\nfunction definition to revision.c, which is a more logical place\nfor it, and add a declaration to revision.h.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n builtin-diff.c |   12 ------------\n builtin-log.c  |    3 ---\n revision.c     |   12 ++++++++++++\n revision.h     |    1 +\n 4 files changed, 13 insertions(+), 15 deletions(-)\n\ndiff --git a/builtin-diff.c b/builtin-diff.c\nindex 7f367b6..e00a212 100644\n--- a/builtin-diff.c\n+++ b/builtin-diff.c\n@@ -176,18 +176,6 @@ static int builtin_diff_combined(struct rev_info *revs,\n \treturn 0;\n }\n \n-void add_head(struct rev_info *revs)\n-{\n-\tunsigned char sha1[20];\n-\tstruct object *obj;\n-\tif (get_sha1(\"HEAD\", sha1))\n-\t\treturn;\n-\tobj = parse_object(sha1);\n-\tif (!obj)\n-\t\treturn;\n-\tadd_pending_object(revs, obj, \"HEAD\");\n-}\n-\n int cmd_diff(int argc, const char **argv, const char *prefix)\n {\n \tint i;\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 3744712..d40a0fc 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -17,9 +17,6 @@\n \n static int default_show_root = 1;\n \n-/* this is in builtin-diff.c */\n-void add_head(struct rev_info *revs);\n-\n static void add_name_decoration(const char *prefix, const char *name, struct object *obj)\n {\n \tint plen = strlen(prefix);\ndiff --git a/revision.c b/revision.c\nindex 0125d41..1bfe80c 100644\n--- a/revision.c\n+++ b/revision.c\n@@ -129,6 +129,18 @@ void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, con\n \t\t\t\t(struct commit *)obj, name);\n }\n \n+void add_head(struct rev_info *revs)\n+{\n+\tunsigned char sha1[20];\n+\tstruct object *obj;\n+\tif (get_sha1(\"HEAD\", sha1))\n+\t\treturn;\n+\tobj = parse_object(sha1);\n+\tif (!obj)\n+\t\treturn;\n+\tadd_pending_object(revs, obj, \"HEAD\");\n+}\n+\n static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)\n {\n \tstruct object *object;\ndiff --git a/revision.h b/revision.h\nindex 2845167..2fa6286 100644\n--- a/revision.h\n+++ b/revision.h\n@@ -132,5 +132,6 @@ extern void add_object(struct object *obj,\n \n extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);\n extern void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode);\n+extern void add_head(struct rev_info *revs);\n \n #endif\n-- \n1.5.2\n"}]}