shallow: rewrite functions to take object_id arguments

diff --git a/transport.c b/transport.c
index eca9b8c817bd723532d7f92da8cfa9f8ee82bb43..58cb9ed033b2b099e3e1100efbc6f437b4054c55 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -283,7 +283,6 @@ static int write_one_ref(const char *name, const unsigned char *sha1,
 {
        struct strbuf *buf = data;
        int len = buf->len;
-       FILE *f;
 
        /* when called via for_each_ref(), flags is non-zero */
        if (flags && !starts_with(name, "refs/heads/") &&
@@ -292,10 +291,9 @@ static int write_one_ref(const char *name, const unsigned char *sha1,
 
        strbuf_addstr(buf, name);
        if (safe_create_leading_directories(buf->buf) ||
-                       !(f = fopen(buf->buf, "w")) ||
-                       fprintf(f, "%s\n", sha1_to_hex(sha1)) < 0 ||
-                       fclose(f))
-               return error("problems writing temporary file %s", buf->buf);
+           write_file(buf->buf, 0, "%s\n", sha1_to_hex(sha1)))
+               return error("problems writing temporary file %s: %s",
+                            buf->buf, strerror(errno));
        strbuf_setlen(buf, len);
        return 0;
 }
@@ -365,7 +363,10 @@ static int rsync_transport_push(struct transport *transport,
        strbuf_addch(&temp_dir, '/');
 
        if (flags & TRANSPORT_PUSH_ALL) {
-               if (for_each_ref(write_one_ref, &temp_dir))
+               struct each_ref_fn_sha1_adapter wrapped_write_one_ref =
+                       {write_one_ref, &temp_dir};
+
+               if (for_each_ref(each_ref_fn_adapter, &wrapped_write_one_ref))
                        return -1;
        } else if (write_refs_to_temp_dir(&temp_dir, refspec_nr, refspec))
                return -1;