summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin-unpack-objects.c4
-rw-r--r--index-pack.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index e70a711..74a90c1 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 e33f605..70640e1 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 {