{"thread":{"id":"43179","subject":"[PATCH] Remove unneeded parameters in diff_unmerge() and diff_get_patch_id()","startedAt":"2006-11-11T17:55:17Z","lastAt":"2006-11-11T17:55:17Z","messageCount":1,"participants":["Michael"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"293979","messageId":"200611111855.17579.barra_cuda@katamail.com","threadId":"43179","inReplyTo":null,"subject":"[PATCH] Remove unneeded parameters in diff_unmerge() and diff_get_patch_id()","fromName":"Michael","fromEmail":"barra_cuda@katamail.com","sentAt":"2006-11-11T17:55:17Z","receivedAt":"2006-11-11T17:55:17Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Signed-off-by: Michael <barra_cuda@katamail.com>\n---\n diff-lib.c |    4 ++--\n diff.c     |    7 +++----\n diff.h     |    3 +--\n 3 files changed, 6 insertions(+), 8 deletions(-)\n\ndiff --git a/diff-lib.c b/diff-lib.c\nindex fc69fb9..df5c793 100644\n--- a/diff-lib.c\n+++ b/diff-lib.c\n@@ -97,7 +97,7 @@ int run_diff_files(struct rev_info *revs\n \t\t\t * Show the diff for the 'ce' if we found the one\n \t\t\t * from the desired stage.\n \t\t\t */\n-\t\t\tdiff_unmerge(&revs->diffopt, ce->name);\n+\t\t\tdiff_unmerge(ce->name);\n \t\t\tif (ce_stage(ce) != diff_unmerged_stage)\n \t\t\t\tcontinue;\n \t\t}\n@@ -299,7 +299,7 @@ static int diff_cache(struct rev_info *r\n \t\t\t\tbreak;\n \t\t\t/* fallthru */\n \t\tcase 3:\n-\t\t\tdiff_unmerge(&revs->diffopt, ce->name);\n+\t\t\tdiff_unmerge(ce->name);\n \t\t\tbreak;\n \n \t\tdefault:\ndiff --git a/diff.c b/diff.c\nindex fb82432..6fda65b 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -2448,7 +2448,7 @@ static void patch_id_consume(void *priv,\n }\n \n /* returns 0 upon success, and writes result into sha1 */\n-static int diff_get_patch_id(struct diff_options *options, unsigned char \n*sha1)\n+static int diff_get_patch_id(unsigned char *sha1)\n {\n \tstruct diff_queue_struct *q = &diff_queued_diff;\n \tint i;\n@@ -2540,7 +2540,7 @@ int diff_flush_patch_id(struct diff_opti\n {\n \tstruct diff_queue_struct *q = &diff_queued_diff;\n \tint i;\n-\tint result = diff_get_patch_id(options, sha1);\n+\tint result = diff_get_patch_id(sha1);\n \n \tfor (i = 0; i < q->nr; i++)\n \t\tdiff_free_filepair(q->queue[i]);\n@@ -2794,8 +2794,7 @@ void diff_change(struct diff_options *op\n \tdiff_queue(&diff_queued_diff, one, two);\n }\n \n-void diff_unmerge(struct diff_options *options,\n-\t\t  const char *path)\n+void diff_unmerge(const char *path)\n {\n \tstruct diff_filespec *one, *two;\n \tone = alloc_filespec(path);\ndiff --git a/diff.h b/diff.h\nindex b48c991..65a14e6 100644\n--- a/diff.h\n+++ b/diff.h\n@@ -138,8 +138,7 @@ extern void diff_change(struct diff_opti\n \t\t\tconst unsigned char *sha2,\n \t\t\tconst char *base, const char *path);\n \n-extern void diff_unmerge(struct diff_options *,\n-\t\t\t const char *path);\n+extern void diff_unmerge(const char *path);\n \n extern int diff_scoreopt_parse(const char *opt);\n \n-- \n1.4.3.3\n"}]}