Re: [PATCH] sha1_file: remove an used fd variable
- From
Jeff King <peff@peff.net>
- Date
- Apr 17, 2017, 01:41 UTC
- Message-ID
- <20170417014140.gxto2q76v6ajxwd3@sigill.intra.peff.net>
- In-Reply-To
- <0102015b7826824a-7bacaa78-5158-4d33-9615-e1a5bffea7a2-000000@eu-west-1.amazonses.com>
On Sun, Apr 16, 2017 at 07:04:01PM +0000, Sebastian Schuberth wrote:
Show 24 quoted lines
> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
> ---
> sha1_file.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/sha1_file.c b/sha1_file.c
> index 7106389..9ecf71f 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -3970,7 +3970,6 @@ int read_loose_object(const char *path,
> void **contents)
> {
> int ret = -1;
> - int fd = -1;
> void *map = NULL;
> unsigned long mapsize;
> git_zstream stream;
> @@ -4020,7 +4019,5 @@ int read_loose_object(const char *path,
> out:
> if (map)
> munmap(map, mapsize);
> - if (fd >= 0)
> - close(fd);
> return ret;Thanks, this looks obviously correct. The mistake is mine; in an early iteration of the series, the caller of map_sha1_file_1() was responsible for opening the file itself, but I later switched it to take the path.
-Peff