[PATCH 1/3] setup: drop return value from `read_repository_format()`
- From
- Martin Ågren <martin.agren@gmail.com>
- Date
- Dec 18, 2018, 07:25 UTC
- Message-ID
- <20181218072528.3870492-2-martin.agren@gmail.com>
- In-Reply-To
- <20181218072528.3870492-1-martin.agren@gmail.com>
No-one looks at the return value, so we might as well drop it. It's still available as `format->version`.
In v1 of what became commit 2cc7c2c737 ("setup: refactor repo format reading and verification", 2016-03-11), this function actually had return type "void", but that was changed in v2. Almost three years later, no-one has used this return value.
Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- I only discovered the full history after writing the patch. Had I known it from the beginning, maybe I'd have just skipped this step, but I was sufficiently disturbed by the redundant and unused return value that I dropped it before working on the actual meat of this series.
cache.h | 7 +++---- setup.c | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/cache.h b/cache.h index ca36b44ee0..8b9e592c65 100644 --- a/cache.h +++ b/cache.h @@ -974,11 +974,10 @@ struct repository_format { /* * Read the repository format characteristics from the config file "path" into - * "format" struct. Returns the numeric version. On error, -1 is returned, - * format->version is set to -1, and all other fields in the struct are - * undefined. + * "format" struct. On error, format->version is set to -1, and all other + * fields in the struct are undefined. */ -int read_repository_format(struct repository_format *format, const char *path); +void read_repository_format(struct repository_format *format, const char *path); /* * Verify that the repository described by repository_format is something we diff --git a/setup.c b/setup.c index 1be5037f12..27747af7a3 100644 --- a/setup.c +++ b/setup.c @@ -509,7 +509,7 @@ static int check_repository_format_gently(const char *gitdir, struct repository_ return 0; } -int read_repository_format(struct repository_format *format, const char *path) +void read_repository_format(struct repository_format *format, const char *path) { memset(format, 0, sizeof(*format)); format->version = -1; @@ -517,7 +517,6 @@ int read_repository_format(struct repository_format *format, const char *path) format->hash_algo = GIT_HASH_SHA1; string_list_init(&format->unknown_extensions, 1); git_config_from_file(check_repo_format, path, format); - return format->version; } int verify_repository_format(const struct repository_format *format,
-- 2.20.1