Re: [PATCH v2 06/24] Convert check_connected to use struct object_id

[Jonathan Nieder]

brian m. carlson wrote:

> Convert check_connected and the callbacks it takes to use struct
> object_id.
>
> Signed-off-by: brian m. carlson 
> ---
>  builtin/clone.c|  4 ++--
>  builtin/fetch.c|  4 ++--
>  builtin/receive-pack.c | 10 +-
>  connected.c| 18 +-
>  connected.h|  4 ++--
>  5 files changed, 20 insertions(+), 20 deletions(-)

Reviewed-by: Jonathan Nieder 

[PATCH v2 06/24] Convert check_connected to use struct object_id

[brian m. carlson]

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

Signed-off-by: brian m. carlson 
---
 builtin/clone.c|  4 ++--
 builtin/fetch.c|  4 ++--
 builtin/receive-pack.c | 10 +-
 connected.c| 18 +-
 connected.h|  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/builtin/clone.c b/builtin/clone.c
index 665a0e2673..5cd1b02d53 100644
--- 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;
@@ -630,7 +630,7 @@ static int iterate_ref_map(void *cb_data, unsigned char 
sha1[20])
if (!ref)
return -1;
 
-   hashcpy(sha1, ref->old_oid.hash);
+   oidcpy(oid, >old_oid);
*rm = ref->next;
return 0;
 }
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 859be91d6c..e705237fa9 100644
--- 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;
@@ -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;
-   hashcpy(sha1, ref->old_oid.hash);
+   oidcpy(oid, >old_oid);
return 0;
 }
 
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 39defd4e3c..046b600b11 100644
--- 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));
 }
 
-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;
@@ -1270,7 +1270,7 @@ static void check_aliased_updates(struct command 
*commands)
string_list_clear(_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;
@@ -1278,7 +1278,7 @@ static int command_singleton_iterator(void *cb_data, 
unsigned char sha1[20])
if (!cmd || is_null_oid(>new_oid))
return -1; /* end of list */
*cmd_list = NULL; /* this returns only one */
-   hashcpy(sha1, cmd->new_oid.hash);
+   oidcpy(oid, >new_oid);
return 0;
 }
 
@@ -1309,7 +1309,7 @@ struct iterate_data {
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 = >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(>new_oid) && !cmd->skip_update) {
-   hashcpy(sha1, cmd->new_oid.hash);
+   oidcpy(oid, >new_oid);
*cmd_list = cmd->next;
return 0;
}
diff --git a/connected.c b/connected.c
index f416b05051..4a47f33270 100644
--- a/connected.c
+++ b/connected.c
@@ -16,13 +16,13 @@
  *
  * 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;
-   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;
@@ -32,7 +32,7 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
opt = 
transport = opt->transport;
 
-   if (fn(cb_data, sha1)) {
+   if (fn(cb_data, )) {
if (opt->err_fd)
close(opt->err_fd);
return err;
@@ -77,7 +77,7 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,