Makes functions void and cleans up calling functions.
David
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
---
builtin-diff.c | 57 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/builtin-diff.c b/builtin-diff.c
index 82afce7..ca157e2 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -90,10 +90,10 @@ static void stuff_change(struct diff_opt
diff_queue(&diff_queued_diff, one, two);
}
-static int builtin_diff_b_f(struct rev_info *revs,
- int argc, const char **argv,
- struct blobinfo *blob,
- const char *path)
+static void builtin_diff_b_f(struct rev_info *revs,
+ int argc, const char **argv,
+ struct blobinfo *blob,
+ const char *path)
{
/* Blob vs file in the working tree*/
struct stat st;
@@ -111,12 +111,11 @@ static int builtin_diff_b_f(struct rev_i
path, path);
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
- return 0;
}
-static int builtin_diff_blobs(struct rev_info *revs,
- int argc, const char **argv,
- struct blobinfo *blob)
+static void builtin_diff_blobs(struct rev_info *revs,
+ int argc, const char **argv,
+ struct blobinfo *blob)
{
unsigned mode = canon_mode(S_IFREG | 0644);
@@ -129,7 +128,6 @@ static int builtin_diff_blobs(struct rev
blob[0].name, blob[1].name);
diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt);
- return 0;
}
static int builtin_diff_index(struct rev_info *revs,
@@ -155,9 +153,9 @@ static int builtin_diff_index(struct rev
return run_diff_index(revs, cached);
}
-static int builtin_diff_tree(struct rev_info *revs,
- int argc, const char **argv,
- struct object_array_entry *ent)
+static void builtin_diff_tree(struct rev_info *revs,
+ int argc, const char **argv,
+ struct object_array_entry *ent)
{
const unsigned char *(sha1[2]);
int swap = 0;
@@ -174,13 +172,12 @@ static int builtin_diff_tree(struct rev_
sha1[1-swap] = ent[1].item->sha1;
diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
log_tree_diff_flush(revs);
- return 0;
}
-static int builtin_diff_combined(struct rev_info *revs,
- int argc, const char **argv,
- struct object_array_entry *ent,
- int ents)
+static void builtin_diff_combined(struct rev_info *revs,
+ int argc, const char **argv,
+ struct object_array_entry *ent,
+ int ents)
{
const unsigned char (*parent)[20];
int i;
@@ -196,7 +193,6 @@ static int builtin_diff_combined(struct
memcpy(parent + i, ent[ents - 1 - i].item->sha1, 20);
diff_tree_combined(parent[0], parent + 1, ents - 1,
revs->dense_combined_merges, revs);
- return 0;
}
void add_head(struct rev_info *revs)
@@ -316,17 +312,16 @@ int cmd_diff(int argc, const char **argv
switch (blobs) {
case 0:
return builtin_diff_files(&rev, argc, argv);
- break;
case 1:
if (paths != 1)
usage(builtin_diff_usage);
- return builtin_diff_b_f(&rev, argc, argv, blob, path);
- break;
+ builtin_diff_b_f(&rev, argc, argv, blob, path);
+ return 0;
case 2:
if (paths)
usage(builtin_diff_usage);
- return builtin_diff_blobs(&rev, argc, argv, blob);
- break;
+ builtin_diff_blobs(&rev, argc, argv, blob);
+ return 0;
default:
usage(builtin_diff_usage);
}
@@ -335,18 +330,20 @@ int cmd_diff(int argc, const char **argv
usage(builtin_diff_usage);
else if (ents == 1)
return builtin_diff_index(&rev, argc, argv);
- else if (ents == 2)
- return builtin_diff_tree(&rev, argc, argv, ent);
- else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
+ else if (ents == 2) {
+ builtin_diff_tree(&rev, argc, argv, ent);
+ return 0;
+ } else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
/* diff A...B where there is one sane merge base between
* A and B. We have ent[0] == merge-base, ent[1] == A,
* and ent[2] == B. Show diff between the base and B.
*/
ent[1] = ent[2];
- return builtin_diff_tree(&rev, argc, argv, ent);
+ builtin_diff_tree(&rev, argc, argv, ent);
+ return 0;
+ } else {
+ builtin_diff_combined(&rev, argc, argv, ent, ents);
+ return 0;
}
- else
- return builtin_diff_combined(&rev, argc, argv,
- ent, ents);
usage(builtin_diff_usage);
}
--
1.4.2.g89bb-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html