[PATCH] sha1_file: move comment about return value where it belongs

Christian Couder· Oct 26, 2013, 22:34 UTC · lore

Commit 5b0864070 (sha1_object_info_extended: make type calculation optional, Jul 12 2013) changed the return value of the sha1_object_info_extended function to 0/-1 for success/error.

Previously this function returned the object type for success or -1 for error. But unfortunately the above commit forgot to change or move the comment above this function that says "returns enum object_type or negative".

To fix this inconsistency, let's move the comment above the sha1_object_info function where it is still true.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 sha1_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to sha1_file.c +1 −1

diff --git a/sha1_file.c b/sha1_file.c
index f80bbe4..7dadd04 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2514,7 +2514,6 @@ static int sha1_loose_object_info(const unsigned char *sha1,
 	return 0;
 }
 
-/* returns enum object_type or negative */
 int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi)
 {
 	struct cached_object *co;
@@ -2563,6 +2562,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi)
 	return 0;
 }
 
+/* returns enum object_type or negative */
 int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
 {
 	enum object_type type;

-- 
1.8.4.rc1.28.ge2684af

Jeff King· Oct 28, 2013, 20:19 UTC · re: Christian Couder · lore

Re: [PATCH] sha1_file: move comment about return value where it belongs

On Sun, Oct 27, 2013 at 12:34:30AM +0200, Christian Couder wrote:

Show 11 quoted lines

> Commit 5b0864070 (sha1_object_info_extended: make type calculation
> optional, Jul 12 2013) changed the return value of the
> sha1_object_info_extended function to 0/-1 for success/error.
> 
> Previously this function returned the object type for success or
> -1 for error. But unfortunately the above commit forgot to change
> or move the comment above this function that says "returns enum
> object_type or negative".
> 
> To fix this inconsistency, let's move the comment above the
> sha1_object_info function where it is still true.

Thanks for catching this. Your analysis and patch looks good to me.

-Peff

patchsha1_file: move comment about return value where it belongs