diff options
| author | Jonas Fonseca <fonseca@diku.dk> | 2006-08-26 16:16:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-26 17:54:06 -0700 |
| commit | 83572c1a914d3f7a8dd66d954c11bbc665b7b923 (patch) | |
| tree | bae4dc57d36b83c835253498dfdabd29d4dec66e /xdiff-interface.c | |
| parent | 095c424d08d96a5f9ee3ca53ae952e92c5cff99b (diff) | |
| download | git-83572c1a914d3f7a8dd66d954c11bbc665b7b923.tar.gz git-83572c1a914d3f7a8dd66d954c11bbc665b7b923.tar.xz | |
Use xrealloc instead of realloc
Change places that use realloc, without a proper error path, to instead use
xrealloc. Drop an erroneous error path in the daemon code that used errno
in the die message in favour of the simpler xrealloc.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 6a82da73b..08602f522 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -69,9 +69,9 @@ int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf) for (i = 0; i < nbuf; i++) { if (mb[i].ptr[mb[i].size-1] != '\n') { /* Incomplete line */ - priv->remainder = realloc(priv->remainder, - priv->remainder_size + - mb[i].size); + priv->remainder = xrealloc(priv->remainder, + priv->remainder_size + + mb[i].size); memcpy(priv->remainder + priv->remainder_size, mb[i].ptr, mb[i].size); priv->remainder_size += mb[i].size; @@ -83,9 +83,9 @@ int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf) consume_one(priv, mb[i].ptr, mb[i].size); continue; } - priv->remainder = realloc(priv->remainder, - priv->remainder_size + - mb[i].size); + priv->remainder = xrealloc(priv->remainder, + priv->remainder_size + + mb[i].size); memcpy(priv->remainder + priv->remainder_size, mb[i].ptr, mb[i].size); consume_one(priv, priv->remainder, |