Hi,
On Tue, 23 Feb 2010, Bert Wesarg wrote:
> Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
> ---
> rerere.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
Looks good to me, except...
> diff --git a/rerere.c b/rerere.c
> index d1d3e75..9ca4cb8 100644
> --- a/rerere.c
> +++ b/rerere.c
> @@ -364,16 +364,17 @@ static int find_conflict(struct string_list *conflict)
> static int merge(const char *name, const char *path)
> {
> int ret;
> - mmfile_t cur, base, other;
> + mmfile_t cur = {NULL, 0}, base = {NULL, 0}, other = {NULL, 0};
> mmbuffer_t result = {NULL, 0};
>
> if (handle_file(path, NULL, rerere_path(name, "thisimage")) < 0)
> return 1;
>
> + ret = 1;
This initialization can come earlier, at declaration time.
> if (read_mmfile(&cur, rerere_path(name, "thisimage")) ||
> read_mmfile(&base, rerere_path(name, "preimage")) ||
> read_mmfile(&other, rerere_path(name, "postimage")))
> - return 1;
> + goto out;
> ret = ll_merge(&result, path, &base, &cur, "", &other, "", 0);
> if (!ret) {
> FILE *f = fopen(path, "w");
Ciao,
Dscho
--
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