refs API: make parse_loose_ref_contents() not set errno
Change the parse_loose_ref_contents() function to stop setting "errno" and failure, and to instead pass up a "failure_errno" via a parameter. This requires changing its callers to do the same. The EINVAL error from parse_loose_ref_contents is used in files-backend to create a custom error message. In untangling this we discovered a tricky edge case. The refs_read_special_head() function was relying on parse_loose_ref_contents() setting EINVAL. By converting it to use "saved_errno" we can migrate away from "errno" in this part of the code entirely, and do away with an existing "save_errno" pattern, its only purpose was to not clobber the "errno" we previously needed at the end of files_read_raw_ref(). Let's assert that we can do that by not having files_read_raw_ref() itself operate on *failure_errno in addition to passing it on. Instead we'll assert that if we return non-zero we actually do set errno, thus assuring ourselves and callers that they can trust the resulting "failure_errno". Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
8b72fea7e9
commit
df3458e957
@ -706,10 +706,12 @@ struct ref_store {
|
||||
};
|
||||
|
||||
/*
|
||||
* Parse contents of a loose ref file.
|
||||
* Parse contents of a loose ref file. *failure_errno maybe be set to EINVAL for
|
||||
* invalid contents.
|
||||
*/
|
||||
int parse_loose_ref_contents(const char *buf, struct object_id *oid,
|
||||
struct strbuf *referent, unsigned int *type);
|
||||
struct strbuf *referent, unsigned int *type,
|
||||
int *failure_errno);
|
||||
|
||||
/*
|
||||
* Fill in the generic part of refs and add it to our collection of
|
||||
|
Reference in New Issue
Block a user