Use hashcpy() when copying object names

We invented hashcpy() to keep the abstraction of "object name"
behind it.  Use it instead of calling memcpy() with hard-coded
20-byte length when moving object names between pieces of memory.

Leave ppc/sha1.c as-is, because the function is about the SHA-1 hash
algorithm whose output is and will always be 20 bytes.

Helped-by: Michael Haggerty <mhagger@alum.mit.edu>
Helped-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Sun He <sunheehnus@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bundle.c b/bundle.c
index e99065ce425ad6e816d946626ef83075ab70bf85..7809fbb1698851fa929a288fd46d3b437e5113ac 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -19,7 +19,7 @@ static void add_to_ref_list(const unsigned char *sha1, const char *name,
                list->list = xrealloc(list->list,
                                list->alloc * sizeof(list->list[0]));
        }
                list->list = xrealloc(list->list,
                                list->alloc * sizeof(list->list[0]));
        }

-       memcpy(list->list[list->nr].sha1, sha1, 20);
+       hashcpy(list->list[list->nr].sha1, sha1);

        list->list[list->nr].name = xstrdup(name);
        list->nr++;
 }
        list->list[list->nr].name = xstrdup(name);
        list->nr++;
 }

diff --git a/grep.c b/grep.c
index c668034739258d0cd1e7108357da80d44891221f..f5101f7218962f026aff7dd2d891cf7bc010a9ea 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1650,7 +1650,7 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
                break;
        case GREP_SOURCE_SHA1:
                gs->identifier = xmalloc(20);
                break;
        case GREP_SOURCE_SHA1:
                gs->identifier = xmalloc(20);

-               memcpy(gs->identifier, identifier, 20);
+               hashcpy(gs->identifier, identifier);

                break;
        case GREP_SOURCE_BUF:
                gs->identifier = NULL;
                break;
        case GREP_SOURCE_BUF:
                gs->identifier = NULL;

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 1218befaf2afa2f0be4be8a582a1f85bab334ed2..5f1791a59c5e9ecd553fb9109fa774d921f777c8 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -530,7 +530,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
        header.version = htons(default_version);
        header.options = htons(flags | options);
        header.entry_count = htonl(writer.selected_nr);
        header.version = htons(default_version);
        header.options = htons(flags | options);
        header.entry_count = htonl(writer.selected_nr);

-       memcpy(header.checksum, writer.pack_checksum, 20);
+       hashcpy(header.checksum, writer.pack_checksum);

 
        sha1write(f, &header, sizeof(header));
        dump_bitmap(f, writer.commits);
 
        sha1write(f, &header, sizeof(header));
        dump_bitmap(f, writer.commits);

diff --git a/reflog-walk.c b/reflog-walk.c
index b2fbdb2392f80a531d5f9a21630a036d45c0a827..d490f7d7d80f19c63276bdd1f402ae55ea59f03c 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -32,8 +32,8 @@ static int read_one_reflog(unsigned char *osha1, unsigned char *nsha1,
                        sizeof(struct reflog_info));
        }
        item = array->items + array->nr;
                        sizeof(struct reflog_info));
        }
        item = array->items + array->nr;

-       memcpy(item->osha1, osha1, 20);
-       memcpy(item->nsha1, nsha1, 20);
+       hashcpy(item->osha1, osha1);
+       hashcpy(item->nsha1, nsha1);

        item->email = xstrdup(email);
        item->timestamp = timestamp;
        item->tz = tz;
        item->email = xstrdup(email);
        item->timestamp = timestamp;
        item->tz = tz;

diff --git a/refs.c b/refs.c
index 89228e23732ef7e2e83a2e84e82ffb5bd7afec3f..f90b7eafe4f7c58502e8ad18f67cbc84c4367fe4 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1222,7 +1222,7 @@ static int resolve_gitlink_packed_ref(struct ref_cache *refs,
        if (ref == NULL)
                return -1;
 
        if (ref == NULL)
                return -1;
 

-       memcpy(sha1, ref->u.value.sha1, 20);
+       hashcpy(sha1, ref->u.value.sha1);

        return 0;
 }
 
        return 0;
 }