![[BACK]](/icons/back.gif){kind=icon}
Return to diff3.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs|
Return to diff3.c CVS log | Up to [local] / src / usr.bin / rcs |
| version 1.37, 2015/09/05 09:47:08 | version 1.38, 2015/11/02 16:45:21 | ||
|---|---|---|---|
|
|
||
| warnx("warning: overlaps or other problems during merge"); | warnx("warning: overlaps or other problems during merge"); | ||
| out: | out: | ||
| if (b2 != NULL) | buf_free(b2); | ||
| buf_free(b2); | buf_free(b3); | ||
| if (b3 != NULL) | buf_free(d1); | ||
| buf_free(b3); | buf_free(d2); | ||
| if (d1 != NULL) | |||
| buf_free(d1); | |||
| if (d2 != NULL) | |||
| buf_free(d2); | |||
| (void)unlink(path1); | (void)unlink(path1); | ||
| (void)unlink(path2); | (void)unlink(path2); | ||
|
|
||
| warnx("warning: overlaps or other problems during merge"); | warnx("warning: overlaps or other problems during merge"); | ||
| out: | out: | ||
| if (b2 != NULL) | buf_free(b2); | ||
| buf_free(b2); | buf_free(b3); | ||
| if (b3 != NULL) | buf_free(d1); | ||
| buf_free(b3); | buf_free(d2); | ||
| if (d1 != NULL) | |||
| buf_free(d1); | |||
| if (d2 != NULL) | |||
| buf_free(d2); | |||
| (void)unlink(path1); | (void)unlink(path1); | ||
| (void)unlink(path2); | (void)unlink(path2); |