{"thread":{"id":"43711","subject":"[PATCH 2/4] xdl_merge(): do return number of conflicts","startedAt":"2006-11-29T23:24:04Z","lastAt":"2006-11-29T23:24:04Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"297176","messageId":"Pine.LNX.4.63.0611300023330.30004@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43711","inReplyTo":null,"subject":"[PATCH 2/4] xdl_merge(): do return number of conflicts","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-11-29T23:24:04Z","receivedAt":"2006-11-29T23:24:04Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nIf no error occurred during merge, xdl_merge() is supposed to return\nthe number of conflicts.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n\n---\n xdiff/xmerge.c |    7 ++++---\n 1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/xdiff/xmerge.c b/xdiff/xmerge.c\nindex 7b85aa5..6b6fbb8 100644\n--- a/xdiff/xmerge.c\n+++ b/xdiff/xmerge.c\n@@ -384,6 +384,7 @@ int xdl_merge(mmfile_t *orig, mmfile_t *\n \t\txpparam_t const *xpp, int level, mmbuffer_t *result) {\n \txdchange_t *xscr1, *xscr2;\n \txdfenv_t xe1, xe2;\n+\tint ret = 0;\n \n \tresult->ptr = NULL;\n \tresult->size = 0;\n@@ -413,9 +414,9 @@ int xdl_merge(mmfile_t *orig, mmfile_t *\n \t\t\tresult->ptr = xdl_malloc(mf1->size);\n \t\t\tmemcpy(result->ptr, mf1->ptr, mf1->size);\n \t\t\tresult->size = mf1->size;\n-\t\t} else if (xdl_do_merge(&xe1, xscr1, name1,\n+\t\t} else if ((ret = xdl_do_merge(&xe1, xscr1, name1,\n \t\t\t\t\t&xe2, xscr2, name2,\n-\t\t\t\t\tlevel, xpp, result) < 0) {\n+\t\t\t\t\tlevel, xpp, result)) < 0) {\n \t\t\txdl_free_script(xscr1);\n \t\t\txdl_free_script(xscr2);\n \t\t\txdl_free_env(&xe1);\n@@ -428,6 +429,6 @@ int xdl_merge(mmfile_t *orig, mmfile_t *\n \txdl_free_env(&xe1);\n \txdl_free_env(&xe2);\n \n-\treturn 0;\n+\treturn ret;\n }\n \n-- \n1.4.4.g5aac-dirty\n"}]}