{"thread":{"id":"5260","subject":"[PATCH 11/28] makes append_ref and show_indepedent void","startedAt":"2006-08-14T20:28:18Z","lastAt":"2006-08-14T20:28:18Z","messageCount":1,"participants":["David Rientjes"],"isPatch":true,"patchVersion":1,"patchTotal":28},"messages":[{"id":"25291","messageId":"Pine.LNX.4.63.0608141327130.19383@chino.corp.google.com","threadId":"5260","inReplyTo":null,"subject":"[PATCH 11/28] makes append_ref and show_indepedent void","fromName":"David Rientjes","fromEmail":"rientjes@google.com","sentAt":"2006-08-14T20:28:18Z","receivedAt":"2006-08-14T20:28:18Z","isPatch":true,"sender":{"key":"rientjes@google.com","avatar":null},"body":"Makes append_ref and show_independent void and cleans up function calls.\n\n\t\tDavid\n\nSigned-off-by: David Rientjes <rientjes@google.com>\n---\n builtin-show-branch.c |   33 ++++++++++++++++++---------------\n 1 files changed, 18 insertions(+), 15 deletions(-)\n\ndiff --git a/builtin-show-branch.c b/builtin-show-branch.c\nindex 2a1b848..3ce1759 100644\n--- a/builtin-show-branch.c\n+++ b/builtin-show-branch.c\n@@ -346,27 +346,26 @@ static void sort_ref_range(int bottom, i\n \t      compare_ref_name);\n }\n \n-static int append_ref(const char *refname, const unsigned char *sha1)\n+static void append_ref(const char *refname, const unsigned char *sha1)\n {\n \tstruct commit *commit = lookup_commit_reference_gently(sha1, 1);\n \tint i;\n \n \tif (!commit)\n-\t\treturn 0;\n+\t\treturn;\n \t/* Avoid adding the same thing twice */\n \tfor (i = 0; i < ref_name_cnt; i++)\n \t\tif (!strcmp(refname, ref_name[i]))\n-\t\t\treturn 0;\n+\t\t\treturn;\n \n \tif (MAX_REVS <= ref_name_cnt) {\n \t\tfprintf(stderr, \"warning: ignoring %s; \"\n \t\t\t\"cannot handle more than %d refs\\n\",\n \t\t\trefname, MAX_REVS);\n-\t\treturn 0;\n+\t\treturn;\n \t}\n \tref_name[ref_name_cnt++] = strdup(refname);\n \tref_name[ref_name_cnt] = NULL;\n-\treturn 0;\n }\n \n static int append_head_ref(const char *refname, const unsigned char *sha1)\n@@ -380,14 +379,16 @@ static int append_head_ref(const char *r\n \t */\n \tif (get_sha1(refname + ofs, tmp) || memcmp(tmp, sha1, 20))\n \t\tofs = 5;\n-\treturn append_ref(refname + ofs, sha1);\n+\tappend_ref(refname + ofs, sha1);\n+\treturn 0;\n }\n \n static int append_tag_ref(const char *refname, const unsigned char *sha1)\n {\n \tif (strncmp(refname, \"refs/tags/\", 10))\n \t\treturn 0;\n-\treturn append_ref(refname + 5, sha1);\n+\tappend_ref(refname + 5, sha1);\n+\treturn 0;\n }\n \n static const char *match_ref_pattern = NULL;\n@@ -420,7 +421,8 @@ static int append_matching_ref(const cha\n \t\treturn append_head_ref(refname, sha1);\n \tif (!strncmp(\"refs/tags/\", refname, 10))\n \t\treturn append_tag_ref(refname, sha1);\n-\treturn append_ref(refname, sha1);\n+\tappend_ref(refname, sha1);\n+\treturn 0;\n }\n \n static void snarf_refs(int head, int tag)\n@@ -473,10 +475,10 @@ static int show_merge_base(struct commit\n \treturn exit_status;\n }\n \n-static int show_independent(struct commit **rev,\n-\t\t\t    int num_rev,\n-\t\t\t    char **ref_name,\n-\t\t\t    unsigned int *rev_mask)\n+static void show_independent(struct commit **rev,\n+\t\t\t     int num_rev,\n+\t\t\t     char **ref_name,\n+\t\t\t     unsigned int *rev_mask)\n {\n \tint i;\n \n@@ -488,7 +490,6 @@ static int show_independent(struct commi\n \t\t\tputs(sha1_to_hex(commit->object.sha1));\n \t\tcommit->object.flags |= UNINTERESTING;\n \t}\n-\treturn 0;\n }\n \n static void append_one_rev(const char *av)\n@@ -706,8 +707,10 @@ int cmd_show_branch(int ac, const char *\n \tif (merge_base)\n \t\treturn show_merge_base(seen, num_rev);\n \n-\tif (independent)\n-\t\treturn show_independent(rev, num_rev, ref_name, rev_mask);\n+\tif (independent) {\n+\t\tshow_independent(rev, num_rev, ref_name, rev_mask);\n+\t\treturn 0;\n+\t}\n \n \t/* Show list; --more=-1 means list-only */\n \tif (1 < num_rev || extra < 0) {\n-- \n1.4.2.g89bb-dirty\n"}]}