X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-delta.c;h=faf96e47130e3a2af26f55fc1173874f078617fc;hb=cfabd6eee1745cfec58cfcb794ce8847e43b888a;hp=3a737da68c8cadb900ffe5b44973d9193fbca83f;hpb=843366961cf14aad6490fbeb30f7b98f37f8833a;p=git.git diff --git a/diff-delta.c b/diff-delta.c index 3a737da68..faf96e471 100644 --- a/diff-delta.c +++ b/diff-delta.c @@ -1,21 +1,14 @@ /* * diff-delta.c: generate a delta between two buffers * - * Many parts of this file have been lifted from LibXDiff version 0.10. - * http://www.xmailserver.org/xdiff-lib.html + * This code was greatly inspired by parts of LibXDiff from Davide Libenzi + * http://www.xmailserver.org/xdiff-lib.html * - * LibXDiff was written by Davide Libenzi - * Copyright (C) 2003 Davide Libenzi + * Rewritten for GIT by Nicolas Pitre , (C) 2005-2007 * - * Many mods for GIT usage by Nicolas Pitre , (C) 2005. - * - * This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Use of this within git automatically means that the LGPL - * licensing gets turned into GPLv2 within this project. + * This code is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. */ #include "git-compat-util.h" @@ -395,7 +388,7 @@ create_delta(const struct delta_index *index, outsize = max_size + MAX_OP_SIZE + 1; if (max_size && outpos > max_size) break; - out = xrealloc(out, outsize); + out = realloc(out, outsize); if (!out) { free(tmp); return NULL;