diff options
| author | Edgar Toernig <froese@gmx.de> | 2006-10-30 17:44:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-30 17:44:27 -0800 |
| commit | 79a65697be00f3b53430930078a7d34b591d5070 (patch) | |
| tree | e0c93e9491df2a8403dd5719577e65ebf54c1a1a | |
| parent | 6dcfa306f2b67b733a7eb2d7ded1bc9987809edb (diff) | |
| download | git-79a65697be00f3b53430930078a7d34b591d5070.tar.gz | |
Use memmove instead of memcpy for overlapping areas
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-unpack-objects.c | 4 | ||||
| -rw-r--r-- | index-pack.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c index e70a71163d..74a90c1129 100644 --- a/builtin-unpack-objects.c +++ b/builtin-unpack-objects.c @@ -22,7 +22,7 @@ static SHA_CTX ctx; * Make sure at least "min" bytes are available in the buffer, and * return the pointer to the buffer. */ -static void * fill(int min) +static void *fill(int min) { if (min <= len) return buffer + offset; @@ -30,7 +30,7 @@ static void * fill(int min) die("cannot fill %d bytes", min); if (offset) { SHA1_Update(&ctx, buffer, offset); - memcpy(buffer, buffer + offset, len); + memmove(buffer, buffer + offset, len); offset = 0; } do { diff --git a/index-pack.c b/index-pack.c index e33f60524f..70640e14d8 100644 --- a/index-pack.c +++ b/index-pack.c @@ -53,7 +53,7 @@ static int input_fd; * Make sure at least "min" bytes are available in the buffer, and * return the pointer to the buffer. */ -static void * fill(int min) +static void *fill(int min) { if (min <= input_len) return input_buffer + input_offset; @@ -61,7 +61,7 @@ static void * fill(int min) die("cannot fill %d bytes", min); if (input_offset) { SHA1_Update(&input_ctx, input_buffer, input_offset); - memcpy(input_buffer, input_buffer + input_offset, input_len); + memmove(input_buffer, input_buffer + input_offset, input_len); input_offset = 0; } do { |