{"thread":{"id":"5253","subject":"[PATCH 04/28] builtin-diff.c cleanup","startedAt":"2006-08-14T20:21:24Z","lastAt":"2006-08-14T20:21:24Z","messageCount":1,"participants":["David Rientjes"],"isPatch":true,"patchVersion":1,"patchTotal":28},"messages":[{"id":"25284","messageId":"Pine.LNX.4.63.0608141320140.19383@chino.corp.google.com","threadId":"5253","inReplyTo":null,"subject":"[PATCH 04/28] builtin-diff.c cleanup","fromName":"David Rientjes","fromEmail":"rientjes@google.com","sentAt":"2006-08-14T20:21:24Z","receivedAt":"2006-08-14T20:21:24Z","isPatch":true,"sender":{"key":"rientjes@google.com","avatar":null},"body":"Makes functions void and cleans up calling functions.\n\n\t\tDavid\n\nSigned-off-by: David Rientjes <rientjes@google.com>\n---\n builtin-diff.c |   57 +++++++++++++++++++++++++++-----------------------------\n 1 files changed, 27 insertions(+), 30 deletions(-)\n\ndiff --git a/builtin-diff.c b/builtin-diff.c\nindex 82afce7..ca157e2 100644\n--- a/builtin-diff.c\n+++ b/builtin-diff.c\n@@ -90,10 +90,10 @@ static void stuff_change(struct diff_opt\n \tdiff_queue(&diff_queued_diff, one, two);\n }\n \n-static int builtin_diff_b_f(struct rev_info *revs,\n-\t\t\t    int argc, const char **argv,\n-\t\t\t    struct blobinfo *blob,\n-\t\t\t    const char *path)\n+static void builtin_diff_b_f(struct rev_info *revs,\n+\t\t\t     int argc, const char **argv,\n+\t\t\t     struct blobinfo *blob,\n+\t\t\t     const char *path)\n {\n \t/* Blob vs file in the working tree*/\n \tstruct stat st;\n@@ -111,12 +111,11 @@ static int builtin_diff_b_f(struct rev_i\n \t\t     path, path);\n \tdiffcore_std(&revs->diffopt);\n \tdiff_flush(&revs->diffopt);\n-\treturn 0;\n }\n \n-static int builtin_diff_blobs(struct rev_info *revs,\n-\t\t\t      int argc, const char **argv,\n-\t\t\t      struct blobinfo *blob)\n+static void builtin_diff_blobs(struct rev_info *revs,\n+\t\t\t       int argc, const char **argv,\n+\t\t\t       struct blobinfo *blob)\n {\n \tunsigned mode = canon_mode(S_IFREG | 0644);\n \n@@ -129,7 +128,6 @@ static int builtin_diff_blobs(struct rev\n \t\t     blob[0].name, blob[1].name);\n \tdiffcore_std(&revs->diffopt);\n \tdiff_flush(&revs->diffopt);\n-\treturn 0;\n }\n \n static int builtin_diff_index(struct rev_info *revs,\n@@ -155,9 +153,9 @@ static int builtin_diff_index(struct rev\n \treturn run_diff_index(revs, cached);\n }\n \n-static int builtin_diff_tree(struct rev_info *revs,\n-\t\t\t     int argc, const char **argv,\n-\t\t\t     struct object_array_entry *ent)\n+static void builtin_diff_tree(struct rev_info *revs,\n+\t\t\t      int argc, const char **argv,\n+\t\t\t      struct object_array_entry *ent)\n {\n \tconst unsigned char *(sha1[2]);\n \tint swap = 0;\n@@ -174,13 +172,12 @@ static int builtin_diff_tree(struct rev_\n \tsha1[1-swap] = ent[1].item->sha1;\n \tdiff_tree_sha1(sha1[0], sha1[1], \"\", &revs->diffopt);\n \tlog_tree_diff_flush(revs);\n-\treturn 0;\n }\n \n-static int builtin_diff_combined(struct rev_info *revs,\n-\t\t\t\t int argc, const char **argv,\n-\t\t\t\t struct object_array_entry *ent,\n-\t\t\t\t int ents)\n+static void builtin_diff_combined(struct rev_info *revs,\n+\t\t\t\t  int argc, const char **argv,\n+\t\t\t\t  struct object_array_entry *ent,\n+\t\t\t\t  int ents)\n {\n \tconst unsigned char (*parent)[20];\n \tint i;\n@@ -196,7 +193,6 @@ static int builtin_diff_combined(struct \n \t\tmemcpy(parent + i, ent[ents - 1 - i].item->sha1, 20);\n \tdiff_tree_combined(parent[0], parent + 1, ents - 1,\n \t\t\t   revs->dense_combined_merges, revs);\n-\treturn 0;\n }\n \n void add_head(struct rev_info *revs)\n@@ -316,17 +312,16 @@ int cmd_diff(int argc, const char **argv\n \t\tswitch (blobs) {\n \t\tcase 0:\n \t\t\treturn builtin_diff_files(&rev, argc, argv);\n-\t\t\tbreak;\n \t\tcase 1:\n \t\t\tif (paths != 1)\n \t\t\t\tusage(builtin_diff_usage);\n-\t\t\treturn builtin_diff_b_f(&rev, argc, argv, blob, path);\n-\t\t\tbreak;\n+\t\t\tbuiltin_diff_b_f(&rev, argc, argv, blob, path);\n+\t\t\treturn 0;\n \t\tcase 2:\n \t\t\tif (paths)\n \t\t\t\tusage(builtin_diff_usage);\n-\t\t\treturn builtin_diff_blobs(&rev, argc, argv, blob);\n-\t\t\tbreak;\n+\t\t\tbuiltin_diff_blobs(&rev, argc, argv, blob);\n+\t\t\treturn 0;\n \t\tdefault:\n \t\t\tusage(builtin_diff_usage);\n \t\t}\n@@ -335,18 +330,20 @@ int cmd_diff(int argc, const char **argv\n \t\tusage(builtin_diff_usage);\n \telse if (ents == 1)\n \t\treturn builtin_diff_index(&rev, argc, argv);\n-\telse if (ents == 2)\n-\t\treturn builtin_diff_tree(&rev, argc, argv, ent);\n-\telse if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {\n+\telse if (ents == 2) {\n+\t\tbuiltin_diff_tree(&rev, argc, argv, ent);\n+\t\treturn 0;\n+\t} else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {\n \t\t/* diff A...B where there is one sane merge base between\n \t\t * A and B.  We have ent[0] == merge-base, ent[1] == A,\n \t\t * and ent[2] == B.  Show diff between the base and B.\n \t\t */\n \t\tent[1] = ent[2];\n-\t\treturn builtin_diff_tree(&rev, argc, argv, ent);\n+\t\tbuiltin_diff_tree(&rev, argc, argv, ent);\n+\t\treturn 0;\n+\t} else {\n+\t\tbuiltin_diff_combined(&rev, argc, argv, ent, ents);\n+\t\treturn 0;\n \t}\n-\telse\n-\t\treturn builtin_diff_combined(&rev, argc, argv,\n-\t\t\t\t\t     ent, ents);\n \tusage(builtin_diff_usage);\n }\n-- \n1.4.2.g89bb-dirty\n"}]}