Re: [PATCH v6 09/22] cache.h: move object functions to object-store.h
From: Taylor Blau <hidden>
Date: 2021-09-16 21:33:23
On Tue, Sep 07, 2021 at 12:58:04PM +0200, Ævar Arnfjörð Bjarmason wrote:
Move the declaration of some ancient object functions added in e.g. c4483576b8d (Add "unpack_sha1_header()" helper function, 2005-06-01) from cache.h to object-store.h. This continues work started in cbd53a2193d (object-store: move object access functions to object-store.h, 2018-05-15).
This builds with DEVELOPER=1, likely as a result of all of the includes on object-store.h added in cbd53a2193d.
quoted hunk ↗ jump to hunk
diff --git a/cache.h b/cache.h index d23de693680..11a04a93436 100644 --- a/cache.h +++ b/cache.h@@ -1313,16 +1313,6 @@ char *xdg_cache_home(const char *filename); int git_open_cloexec(const char *name, int flags); #define git_open(name) git_open_cloexec(name, O_RDONLY) -int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz); -int parse_loose_header(const char *hdr, unsigned long *sizep); - -int check_object_signature(struct repository *r, const struct object_id *oid, - void *buf, unsigned long size, const char *type); - -int finalize_object_file(const char *tmpfile, const char *filename); - -/* Helper to check and "touch" a file */
I'm fine to drop this comment, by the way, since it does not add any explanation to what a function called check_and_freshen_file() might do ;).
-int check_and_freshen_file(const char *fn, int freshen);
Everything else looks fine, although it's unclear how this is related to the rest of your series. Thanks, Taylor