xmerge: make return value from xdl_merge() more usable.
The callers would want to know if the resulting merge is clean; do not discard that information away after calling xdl_do_merge(). Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Nov 29, 2006 at 12:06 UTC
53a7085a104936aef29400369aab15e0d1ccbb28
1 file changed
+7
-10
xdiff/xmerge.c
+7
-10
@@ -384,6 +384,7 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
384
xpparam_t const *xpp, int level, mmbuffer_t *result) {
385
xdchange_t *xscr1, *xscr2;
386
xdfenv_t xe1, xe2;
387
+ int status;
388
389
result->ptr = NULL;
390
result->size = 0;
@@ -404,6 +405,7 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
405
xdl_free_env(&xe2);
406
return -1;
407
}
408
+ status = 0;
409
if (xscr1 || xscr2) {
410
if (!xscr1) {
411
result->ptr = xdl_malloc(mf2->size);
@@ -413,14 +415,10 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
415
result->ptr = xdl_malloc(mf1->size);
416
memcpy(result->ptr, mf1->ptr, mf1->size);
417
result->size = mf1->size;
416
- } else if (xdl_do_merge(&xe1, xscr1, name1,
417
- &xe2, xscr2, name2,
418
- level, xpp, result) < 0) {
419
- xdl_free_script(xscr1);
420
- xdl_free_script(xscr2);
421
- xdl_free_env(&xe1);
422
- xdl_free_env(&xe2);
423
- return -1;
418
+ } else {
419
+ status = xdl_do_merge(&xe1, xscr1, name1,
420
+ &xe2, xscr2, name2,
421
+ level, xpp, result);
422
}
423
xdl_free_script(xscr1);
424
xdl_free_script(xscr2);
@@ -428,6 +426,5 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
426
xdl_free_env(&xe1);
427
xdl_free_env(&xe2);
428
431
- return 0;
429
+ return status;
430
}
433
-