Convert check_connected to use struct object_id

Convert check_connected and the callbacks it takes to use struct
object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/clone.c b/builtin/clone.c
index 665a0e2673f2864d579791c1fa13f37cae58ccc4..5cd1b02d531cfb8dc6be145683e856e1f32f8de2 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -615,7 +615,7 @@ static void write_followtags(const struct ref *refs, const char *msg)
        }
 }
 
        }
 }
 

-static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
+static int iterate_ref_map(void *cb_data, struct object_id *oid)

 {
        struct ref **rm = cb_data;
        struct ref *ref = *rm;
 {
        struct ref **rm = cb_data;
        struct ref *ref = *rm;


@@ -630,7 +630,7 @@ static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
        if (!ref)
                return -1;
 
        if (!ref)
                return -1;
 

-       hashcpy(sha1, ref->old_oid.hash);
+       oidcpy(oid, &ref->old_oid);

        *rm = ref->next;
        return 0;
 }
        *rm = ref->next;
        return 0;
 }

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 859be91d6cd707b3b3123b2485c6a09f985c0ea9..e705237fa900dd7e4e73a58e7b6dad425bc7e431 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -727,7 +727,7 @@ static int update_local_ref(struct ref *ref,
        }
 }
 
        }
 }
 

-static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
+static int iterate_ref_map(void *cb_data, struct object_id *oid)

 {
        struct ref **rm = cb_data;
        struct ref *ref = *rm;
 {
        struct ref **rm = cb_data;
        struct ref *ref = *rm;


@@ -737,7 +737,7 @@ static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
        if (!ref)
                return -1; /* end of the list */
        *rm = ref->next;
        if (!ref)
                return -1; /* end of the list */
        *rm = ref->next;

-       hashcpy(sha1, ref->old_oid.hash);
+       oidcpy(oid, &ref->old_oid);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 2da3c4cd5cd7a10cec9f1669b35e4f55c9e5a3b3..4d37a160d759889e28602adc6064cde044248e4e 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -870,7 +870,7 @@ static void refuse_unconfigured_deny_delete_current(void)
        rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg));
 }
 
        rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg));
 }
 

-static int command_singleton_iterator(void *cb_data, unsigned char sha1[20]);
+static int command_singleton_iterator(void *cb_data, struct object_id *oid);

 static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 {
        static struct lock_file shallow_lock;
 static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 {
        static struct lock_file shallow_lock;


@@ -1270,7 +1270,7 @@ static void check_aliased_updates(struct command *commands)
        string_list_clear(&ref_list, 0);
 }
 
        string_list_clear(&ref_list, 0);
 }
 

-static int command_singleton_iterator(void *cb_data, unsigned char sha1[20])
+static int command_singleton_iterator(void *cb_data, struct object_id *oid)

 {
        struct command **cmd_list = cb_data;
        struct command *cmd = *cmd_list;
 {
        struct command **cmd_list = cb_data;
        struct command *cmd = *cmd_list;


@@ -1278,7 +1278,7 @@ static int command_singleton_iterator(void *cb_data, unsigned char sha1[20])
        if (!cmd || is_null_oid(&cmd->new_oid))
                return -1; /* end of list */
        *cmd_list = NULL; /* this returns only one */
        if (!cmd || is_null_oid(&cmd->new_oid))
                return -1; /* end of list */
        *cmd_list = NULL; /* this returns only one */

-       hashcpy(sha1, cmd->new_oid.hash);
+       oidcpy(oid, &cmd->new_oid);

        return 0;
 }
 
        return 0;
 }
 


@@ -1309,7 +1309,7 @@ struct iterate_data {
        struct shallow_info *si;
 };
 
        struct shallow_info *si;
 };
 

-static int iterate_receive_command_list(void *cb_data, unsigned char sha1[20])
+static int iterate_receive_command_list(void *cb_data, struct object_id *oid)

 {
        struct iterate_data *data = cb_data;
        struct command **cmd_list = &data->cmds;
 {
        struct iterate_data *data = cb_data;
        struct command **cmd_list = &data->cmds;


@@ -1320,7 +1320,7 @@ static int iterate_receive_command_list(void *cb_data, unsigned char sha1[20])
                        /* to be checked in update_shallow_ref() */
                        continue;
                if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) {
                        /* to be checked in update_shallow_ref() */
                        continue;
                if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) {

-                       hashcpy(sha1, cmd->new_oid.hash);
+                       oidcpy(oid, &cmd->new_oid);

                        *cmd_list = cmd->next;
                        return 0;
                }
                        *cmd_list = cmd->next;
                        return 0;
                }

diff --git a/connected.c b/connected.c
index f416b05051f3b794c9be74e9baaf3b84e18ff6a2..4a47f332706a332174610ae275b3bcb5afd30f2f 100644 (file)
--- a/connected.c
+++ b/connected.c
@@ -16,13 +16,13 @@
  *
  * Returns 0 if everything is connected, non-zero otherwise.
  */
  *
  * Returns 0 if everything is connected, non-zero otherwise.
  */

-int check_connected(sha1_iterate_fn fn, void *cb_data,
+int check_connected(oid_iterate_fn fn, void *cb_data,

                    struct check_connected_options *opt)
 {
        struct child_process rev_list = CHILD_PROCESS_INIT;
        struct check_connected_options defaults = CHECK_CONNECTED_INIT;
                    struct check_connected_options *opt)
 {
        struct child_process rev_list = CHILD_PROCESS_INIT;
        struct check_connected_options defaults = CHECK_CONNECTED_INIT;

-       char commit[41];
-       unsigned char sha1[20];
+       char commit[GIT_MAX_HEXSZ + 1];
+       struct object_id oid;

        int err = 0;
        struct packed_git *new_pack = NULL;
        struct transport *transport;
        int err = 0;
        struct packed_git *new_pack = NULL;
        struct transport *transport;


@@ -32,7 +32,7 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
                opt = &defaults;
        transport = opt->transport;
 
                opt = &defaults;
        transport = opt->transport;
 

-       if (fn(cb_data, sha1)) {
+       if (fn(cb_data, &oid)) {

                if (opt->err_fd)
                        close(opt->err_fd);
                return err;
                if (opt->err_fd)
                        close(opt->err_fd);
                return err;


@@ -77,7 +77,7 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
 
        sigchain_push(SIGPIPE, SIG_IGN);
 
 
        sigchain_push(SIGPIPE, SIG_IGN);
 

-       commit[40] = '\n';
+       commit[GIT_SHA1_HEXSZ] = '\n';

        do {
                /*
                 * If index-pack already checked that:
        do {
                /*
                 * If index-pack already checked that:


@@ -87,17 +87,17 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
                 * are sure the ref is good and not sending it to
                 * rev-list for verification.
                 */
                 * are sure the ref is good and not sending it to
                 * rev-list for verification.
                 */

-               if (new_pack && find_pack_entry_one(sha1, new_pack))
+               if (new_pack && find_pack_entry_one(oid.hash, new_pack))

                        continue;
 
                        continue;
 

-               memcpy(commit, sha1_to_hex(sha1), 40);
-               if (write_in_full(rev_list.in, commit, 41) < 0) {
+               memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ);
+               if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) {

                        if (errno != EPIPE && errno != EINVAL)
                                error_errno(_("failed write to rev-list"));
                        err = -1;
                        break;
                }
                        if (errno != EPIPE && errno != EINVAL)
                                error_errno(_("failed write to rev-list"));
                        err = -1;
                        break;
                }

-       } while (!fn(cb_data, sha1));
+       } while (!fn(cb_data, &oid));

 
        if (close(rev_list.in))
                err = error_errno(_("failed to close rev-list's stdin"));
 
        if (close(rev_list.in))
                err = error_errno(_("failed to close rev-list's stdin"));

diff --git a/connected.h b/connected.h
index 4ca325f79dc5ee45823834f71f66a6d3b278c3e5..a53f03a61aca4871be5ab75db9bf63ee895668e1 100644 (file)
--- a/connected.h
+++ b/connected.h
@@ -8,7 +8,7 @@ struct transport;
  * When called after returning the name for the last object, return -1
  * to signal EOF, otherwise return 0.
  */
  * When called after returning the name for the last object, return -1
  * to signal EOF, otherwise return 0.
  */

-typedef int (*sha1_iterate_fn)(void *, unsigned char [20]);
+typedef int (*oid_iterate_fn)(void *, struct object_id *oid);

 
 /*
  * Named-arguments struct for check_connected. All arguments are
 
 /*
  * Named-arguments struct for check_connected. All arguments are


@@ -51,7 +51,7 @@ struct check_connected_options {
  *
  * If "opt" is NULL, behaves as if CHECK_CONNECTED_INIT was passed.
  */
  *
  * If "opt" is NULL, behaves as if CHECK_CONNECTED_INIT was passed.
  */

-int check_connected(sha1_iterate_fn fn, void *cb_data,
+int check_connected(oid_iterate_fn fn, void *cb_data,

                    struct check_connected_options *opt);
 
 #endif /* CONNECTED_H */
                    struct check_connected_options *opt);
 
 #endif /* CONNECTED_H */