@matheusbsbs / matheus-bagliano / commits / 1427a7ff70

write_sha1_file(): do not use a separate sha1[] array

In the beginning, write_sha1_file() did not have a way to tell the caller the name of the object it wrote to the caller. This was changed in d6d3f9d0 (This implements the new "recursive tree" write-tree., 2005-04-09) by adding the "returnsha1" parameter to the function so that the callers who are interested in the value can optionally pass a pointer to receive it. It turns out that all callers do want to know the name of the object it just has written. Nobody passes a NULL to this parameter, hence it is not necessary to use a separate sha1[] array to receive the result from write_sha1_file_prepare(), and copy the result to the returnsha1 supplied by the caller. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed May 4, 2015 at 11:08 UTC 1427a7ff70bce0c1040831d5d674c83ebcda6d7d

1 file changed +1 -4

sha1_file.c

+1 -4

@@ -2945,9 +2945,8 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,

2945 return move_temp_to_file(tmp_file, filename);

2946 }

2947

2948 -int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *returnsha1)

2948 +int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1)

2949 {

2950 - unsigned char sha1[20];

2950 char hdr[32];

2951 int hdrlen;

2952

@@ -2955,8 +2954,6 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign

2954 * it out into .git/objects/??/?{38} file.

2955 */

2956 write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);

2958 - if (returnsha1)

2959 - hashcpy(returnsha1, sha1);

2957 if (has_sha1_file(sha1))

2958 return 0;

2959 return write_loose_object(sha1, hdr, hdrlen, buf, len, 0);