From: Carlo Marcelo Arenas Belón Date: Mon, 9 Aug 2021 01:38:32 +0000 (-0700) Subject: object-store: avoid extra ';' from KHASH_INIT X-Git-Tag: v2.33.0-rc2~2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd3c8a72a2eaecf0c752a37e1f4ba4de59818e93;p=thirdparty%2Fgit.git object-store: avoid extra ';' from KHASH_INIT cf2dc1c238 (speed up alt_odb_usable() with many alternates, 2021-07-07) introduces a KHASH_INIT invocation with a trailing ';', which while commonly expected will trigger warnings with pedantic on both clang[-Wextra-semi] and gcc[-Wpedantic], because that macro has already a semicolon and is meant to be invoked without one. while fixing the macro would be a worthy solution (specially considering this is a common recurring problem), remove the extra ';' for now to minimize churn. Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Junio C Hamano --- diff --git a/object-store.h b/object-store.h index e679acc4c3..d24915ced1 100644 --- a/object-store.h +++ b/object-store.h @@ -34,7 +34,7 @@ struct object_directory { }; KHASH_INIT(odb_path_map, const char * /* key: odb_path */, - struct object_directory *, 1, fspathhash, fspatheq); + struct object_directory *, 1, fspathhash, fspatheq) void prepare_alt_odb(struct repository *r); char *compute_alternate_path(const char *path, struct strbuf *err);