sha1_file: convert hash_sha1_file to object_id

Convert the declaration and definition of hash_sha1_file to use
struct object_id and adjust all function calls.

Rename this function to hash_object_file.

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/apply.c b/apply.c
index 321a9fa68d491f7e5e89dc9e398b067f67a10c77..57ab8a8a29bada2492488fa604a04bed2dd4b6cd 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -3154,7 +3154,7 @@ static int apply_binary(struct apply_state *state,
                 * See if the old one matches what the patch
                 * applies to.
                 */
                 * See if the old one matches what the patch
                 * applies to.
                 */

-               hash_sha1_file(img->buf, img->len, blob_type, oid.hash);
+               hash_object_file(img->buf, img->len, blob_type, &oid);

                if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))
                        return error(_("the patch applies to '%s' (%s), "
                                       "which does not match the "
                if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))
                        return error(_("the patch applies to '%s' (%s), "
                                       "which does not match the "


@@ -3199,7 +3199,7 @@ static int apply_binary(struct apply_state *state,
                                     name);
 
                /* verify that the result matches */
                                     name);
 
                /* verify that the result matches */

-               hash_sha1_file(img->buf, img->len, blob_type, oid.hash);
+               hash_object_file(img->buf, img->len, blob_type, &oid);

                if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))
                        return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
                                name, patch->new_sha1_prefix, oid_to_hex(&oid));
                if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))
                        return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
                                name, patch->new_sha1_prefix, oid_to_hex(&oid));

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 4c51aec81f374d52e7c6a1afa73ab9dea3cf40b8..7f5a95e6ff6ba7e4b0ed0115bf8ee82e1c29872e 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -958,9 +958,8 @@ static void resolve_delta(struct object_entry *delta_obj,
        free(delta_data);
        if (!result->data)
                bad_object(delta_obj->idx.offset, _("failed to apply delta"));
        free(delta_data);
        if (!result->data)
                bad_object(delta_obj->idx.offset, _("failed to apply delta"));

-       hash_sha1_file(result->data, result->size,
-                      typename(delta_obj->real_type),
-                      delta_obj->idx.oid.hash);
+       hash_object_file(result->data, result->size,
+                        typename(delta_obj->real_type), &delta_obj->idx.oid);

        sha1_object(result->data, NULL, result->size, delta_obj->real_type,
                    &delta_obj->idx.oid);
        counter_lock();
        sha1_object(result->data, NULL, result->size, delta_obj->real_type,
                    &delta_obj->idx.oid);
        counter_lock();

diff --git a/builtin/replace.c b/builtin/replace.c
index 10078ae37136f154486d8163b6b905ad163c7047..814bf6bfdead377b9294611c2fea74a5f35636b7 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -355,7 +355,7 @@ static void check_one_mergetag(struct commit *commit,
        struct tag *tag;
        int i;
 
        struct tag *tag;
        int i;
 

-       hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), tag_oid.hash);
+       hash_object_file(extra->value, extra->len, typename(OBJ_TAG), &tag_oid);

        tag = lookup_tag(&tag_oid);
        if (!tag)
                die(_("bad mergetag in commit '%s'"), ref);
        tag = lookup_tag(&tag_oid);
        if (!tag)
                die(_("bad mergetag in commit '%s'"), ref);

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 62ea264c46783374d0f1968c19ea7581498a1f87..85a40d1af797f760df1e5c4df20984d6317959a6 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -258,7 +258,7 @@ static void write_object(unsigned nr, enum object_type type,
        } else {
                struct object *obj;
                int eaten;
        } else {
                struct object *obj;
                int eaten;

-               hash_sha1_file(buf, size, typename(type), obj_list[nr].oid.hash);
+               hash_object_file(buf, size, typename(type), &obj_list[nr].oid);

                added_object(nr, type, buf, size);
                obj = parse_object_buffer(&obj_list[nr].oid, type, size, buf,
                                          &eaten);
                added_object(nr, type, buf, size);
                obj = parse_object_buffer(&obj_list[nr].oid, type, size, buf,
                                          &eaten);

diff --git a/cache-tree.c b/cache-tree.c
index e03e72c34a5c1fc618994ee63f38875d28d91886..6574eeb80dc972b8533363937e072dca0ea61930 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -400,15 +400,14 @@ static int update_one(struct cache_tree *it,
        }
 
        if (repair) {
        }
 
        if (repair) {

-               unsigned char sha1[20];
-               hash_sha1_file(buffer.buf, buffer.len, tree_type, sha1);
-               if (has_sha1_file(sha1))
-                       hashcpy(it->oid.hash, sha1);
+               struct object_id oid;
+               hash_object_file(buffer.buf, buffer.len, tree_type, &oid);
+               if (has_sha1_file(oid.hash))
+                       oidcpy(&it->oid, &oid);

                else
                        to_invalidate = 1;
        } else if (dryrun)
                else
                        to_invalidate = 1;
        } else if (dryrun)

-               hash_sha1_file(buffer.buf, buffer.len, tree_type,
-                              it->oid.hash);
+               hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid);

        else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->oid.hash)) {
                strbuf_release(&buffer);
                return -1;
        else if (write_sha1_file(buffer.buf, buffer.len, tree_type, it->oid.hash)) {
                strbuf_release(&buffer);
                return -1;

diff --git a/cache.h b/cache.h
index ed72933ba743280a93d91f0b8618a4c39da35946..08f2b81e1b4a2c1093932dd7224a20c2b12a2860 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1236,7 +1236,10 @@ static inline const unsigned char *lookup_replace_object(const unsigned char *sh
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int sha1_object_info(const unsigned char *, unsigned long *);
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int sha1_object_info(const unsigned char *, unsigned long *);

-extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
+
+extern int hash_object_file(const void *buf, unsigned long len,
+                           const char *type, struct object_id *oid);
+

 extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
 extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
 
 extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
 extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
 

diff --git a/convert.c b/convert.c
index 1a41a48e15efd7a6c3030e7a0d1097cbc08099c1..5e46708c73fc01a720859fe194f4afea7c763d97 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -898,7 +898,7 @@ static int ident_to_git(const char *path, const char *src, size_t len,
 static int ident_to_worktree(const char *path, const char *src, size_t len,
                              struct strbuf *buf, int ident)
 {
 static int ident_to_worktree(const char *path, const char *src, size_t len,
                              struct strbuf *buf, int ident)
 {

-       unsigned char sha1[20];
+       struct object_id oid;

        char *to_free = NULL, *dollar, *spc;
        int cnt;
 
        char *to_free = NULL, *dollar, *spc;
        int cnt;
 


@@ -912,7 +912,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
        /* are we "faking" in place editing ? */
        if (src == buf->buf)
                to_free = strbuf_detach(buf, NULL);
        /* are we "faking" in place editing ? */
        if (src == buf->buf)
                to_free = strbuf_detach(buf, NULL);

-       hash_sha1_file(src, len, "blob", sha1);
+       hash_object_file(src, len, "blob", &oid);

 
        strbuf_grow(buf, len + cnt * 43);
        for (;;) {
 
        strbuf_grow(buf, len + cnt * 43);
        for (;;) {


@@ -969,7 +969,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
 
                /* step 4: substitute */
                strbuf_addstr(buf, "Id: ");
 
                /* step 4: substitute */
                strbuf_addstr(buf, "Id: ");

-               strbuf_add(buf, sha1_to_hex(sha1), 40);
+               strbuf_addstr(buf, oid_to_hex(&oid));

                strbuf_addstr(buf, " $");
        }
        strbuf_add(buf, src, len);
                strbuf_addstr(buf, " $");
        }
        strbuf_add(buf, src, len);

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 245e999fe5c6e9da62303423570d07aae5a88897..e27d0bb6327c173260d436f4fe63f1ac9a1fa228 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -260,8 +260,8 @@ static unsigned int hash_filespec(struct diff_filespec *filespec)
        if (!filespec->oid_valid) {
                if (diff_populate_filespec(filespec, 0))
                        return 0;
        if (!filespec->oid_valid) {
                if (diff_populate_filespec(filespec, 0))
                        return 0;

-               hash_sha1_file(filespec->data, filespec->size, "blob",
-                              filespec->oid.hash);
+               hash_object_file(filespec->data, filespec->size, "blob",
+                                &filespec->oid);

        }
        return sha1hash(filespec->oid.hash);
 }
        }
        return sha1hash(filespec->oid.hash);
 }

diff --git a/dir.c b/dir.c
index 22cadbda9d90e1797455150096b6007dcd4dd826..fe0f25463f957d65ee6914fd8bf040b0e5257789 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -846,8 +846,8 @@ static int add_excludes(const char *fname, const char *base, int baselen,
                                oidcpy(&oid_stat->oid,
                                       &istate->cache[pos]->oid);
                        else
                                oidcpy(&oid_stat->oid,
                                       &istate->cache[pos]->oid);
                        else

-                               hash_sha1_file(buf, size, "blob",
-                                              oid_stat->oid.hash);
+                               hash_object_file(buf, size, "blob",
+                                                &oid_stat->oid);

                        fill_stat_data(&oid_stat->stat, &st);
                        oid_stat->valid = 1;
                }
                        fill_stat_data(&oid_stat->stat, &st);
                        oid_stat->valid = 1;
                }

diff --git a/log-tree.c b/log-tree.c
index fca29d4799da27164394a8c59da067a0522241fe..fc0cc0d6d11cbec37b87004f3a56cc4c5495bc72 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -499,7 +499,7 @@ static void show_one_mergetag(struct commit *commit,
        int status, nth;
        size_t payload_size, gpg_message_offset;
 
        int status, nth;
        size_t payload_size, gpg_message_offset;
 

-       hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), oid.hash);
+       hash_object_file(extra->value, extra->len, typename(OBJ_TAG), &oid);

        tag = lookup_tag(&oid);
        if (!tag)
                return; /* error message already given */
        tag = lookup_tag(&oid);
        if (!tag)
                return; /* error message already given */

diff --git a/sha1_file.c b/sha1_file.c
index 830b93b42807d60963f5eb2d7e8c08ca0a77f47f..4c44c60cec52a47800d6ac40ceaaa6f211b1ef71 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -788,7 +788,7 @@ void *xmmap(void *start, size_t length,
 int check_sha1_signature(const unsigned char *sha1, void *map,
                         unsigned long size, const char *type)
 {
 int check_sha1_signature(const unsigned char *sha1, void *map,
                         unsigned long size, const char *type)
 {

-       unsigned char real_sha1[20];
+       struct object_id real_oid;

        enum object_type obj_type;
        struct git_istream *st;
        git_SHA_CTX c;
        enum object_type obj_type;
        struct git_istream *st;
        git_SHA_CTX c;


@@ -796,8 +796,8 @@ int check_sha1_signature(const unsigned char *sha1, void *map,
        int hdrlen;
 
        if (map) {
        int hdrlen;
 
        if (map) {

-               hash_sha1_file(map, size, type, real_sha1);
-               return hashcmp(sha1, real_sha1) ? -1 : 0;
+               hash_object_file(map, size, type, &real_oid);
+               return hashcmp(sha1, real_oid.hash) ? -1 : 0;

        }
 
        st = open_istream(sha1, &obj_type, &size, NULL);
        }
 
        st = open_istream(sha1, &obj_type, &size, NULL);


@@ -822,9 +822,9 @@ int check_sha1_signature(const unsigned char *sha1, void *map,
                        break;
                git_SHA1_Update(&c, buf, readlen);
        }
                        break;
                git_SHA1_Update(&c, buf, readlen);
        }

-       git_SHA1_Final(real_sha1, &c);
+       git_SHA1_Final(real_oid.hash, &c);

        close_istream(st);
        close_istream(st);

-       return hashcmp(sha1, real_sha1) ? -1 : 0;
+       return hashcmp(sha1, real_oid.hash) ? -1 : 0;

 }
 
 int git_open_cloexec(const char *name, int flags)
 }
 
 int git_open_cloexec(const char *name, int flags)


@@ -1317,7 +1317,7 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type,
 {
        struct cached_object *co;
 
 {
        struct cached_object *co;
 

-       hash_sha1_file(buf, len, typename(type), oid->hash);
+       hash_object_file(buf, len, typename(type), oid);

        if (has_sha1_file(oid->hash) || find_cached_object(oid->hash))
                return 0;
        ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc);
        if (has_sha1_file(oid->hash) || find_cached_object(oid->hash))
                return 0;
        ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc);


@@ -1485,12 +1485,12 @@ static int write_buffer(int fd, const void *buf, size_t len)
        return 0;
 }
 
        return 0;
 }
 

-int hash_sha1_file(const void *buf, unsigned long len, const char *type,
-                   unsigned char *sha1)
+int hash_object_file(const void *buf, unsigned long len, const char *type,
+                    struct object_id *oid)

 {
        char hdr[32];
        int hdrlen = sizeof(hdr);
 {
        char hdr[32];
        int hdrlen = sizeof(hdr);

-       write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
+       write_sha1_file_prepare(buf, len, type, oid->hash, hdr, &hdrlen);

        return 0;
 }
 
        return 0;
 }
 


@@ -1769,7 +1769,7 @@ static int index_mem(struct object_id *oid, void *buf, size_t size,
        if (write_object)
                ret = write_sha1_file(buf, size, typename(type), oid->hash);
        else
        if (write_object)
                ret = write_sha1_file(buf, size, typename(type), oid->hash);
        else

-               ret = hash_sha1_file(buf, size, typename(type), oid->hash);
+               ret = hash_object_file(buf, size, typename(type), oid);

        if (re_allocated)
                free(buf);
        return ret;
        if (re_allocated)
                free(buf);
        return ret;


@@ -1792,8 +1792,8 @@ static int index_stream_convert_blob(struct object_id *oid, int fd,
                ret = write_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
                                      oid->hash);
        else
                ret = write_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
                                      oid->hash);
        else

-               ret = hash_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
-                                    oid->hash);
+               ret = hash_object_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
+                                      oid);

        strbuf_release(&sbuf);
        return ret;
 }
        strbuf_release(&sbuf);
        return ret;
 }


@@ -1907,7 +1907,7 @@ int index_path(struct object_id *oid, const char *path, struct stat *st, unsigne
                if (strbuf_readlink(&sb, path, st->st_size))
                        return error_errno("readlink(\"%s\")", path);
                if (!(flags & HASH_WRITE_OBJECT))
                if (strbuf_readlink(&sb, path, st->st_size))
                        return error_errno("readlink(\"%s\")", path);
                if (!(flags & HASH_WRITE_OBJECT))

-                       hash_sha1_file(sb.buf, sb.len, blob_type, oid->hash);
+                       hash_object_file(sb.buf, sb.len, blob_type, oid);

                else if (write_sha1_file(sb.buf, sb.len, blob_type, oid->hash))
                        rc = error("%s: failed to insert into database", path);
                strbuf_release(&sb);
                else if (write_sha1_file(sb.buf, sb.len, blob_type, oid->hash))
                        rc = error("%s: failed to insert into database", path);
                strbuf_release(&sb);