[PATCH] sha1_file: remove an used fd variable

Sebastian Schuberth· Apr 16, 2017, 19:04 UTC · lore

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 sha1_file.c | 3 ---
 1 file changed, 3 deletions(-)

Show changes to sha1_file.c +0 −4

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;
 }

--
https://github.com/git/git/pull/344

Jeff King· Apr 17, 2017, 01:41 UTC · re: Sebastian Schuberth · lore

Re: [PATCH] sha1_file: remove an used fd variable

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

patchsha1_file: remove an used fd variable