diff options
author | Jeff King <peff@peff.net> | 2017-03-28 21:45:25 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-29 00:28:04 +0200 |
commit | 892e723afd2b5696e4d75280e730bf9f1ea92329 (patch) | |
tree | 072a0e33a4353dffa1e54bcdc58b9f80658cc2c1 /cache.h | |
parent | Ninth batch for 2.13 (diff) | |
download | git-892e723afd2b5696e4d75280e730bf9f1ea92329.tar.xz git-892e723afd2b5696e4d75280e730bf9f1ea92329.zip |
do not check odb_mkstemp return value for errors
The odb_mkstemp function does not return an error; it dies
on failure instead. But many of its callers compare the
resulting descriptor against -1 and die themselves.
Mostly this is just pointless, but it does raise a question
when looking at the callers: if they show the results of the
"template" buffer after a failure, what's in it? The answer
is: it doesn't matter, because it cannot happen.
So let's make that clear by removing the bogus error checks.
In bitmap_writer_finish(), we can drop the error-handling
code entirely. In the other two cases, it's shared with the
open() in another code path; we can just move the
error-check next to that open() call.
And while we're at it, let's flesh out the function's
docstring a bit to make the error behavior clear.
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1674,7 +1674,10 @@ extern struct packed_git *find_sha1_pack(const unsigned char *sha1, extern void pack_report(void); /* - * Create a temporary file rooted in the object database directory. + * Create a temporary file rooted in the object database directory, or + * die on failure. The filename is taken from "pattern", which should have the + * usual "XXXXXX" trailer, and the resulting filename is written into the + * "template" buffer. Returns the open descriptor. */ extern int odb_mkstemp(char *template, size_t limit, const char *pattern); |