diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2017-08-26 10:28:08 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-26 09:21:01 -0700 |
| commit | 67c9b422513ac601c68c191a026af968a2838ae1 (patch) | |
| tree | 4bde2684e75e0c30c007405d147ff14955cd9064 /notes.c | |
| parent | load_subtree(): only consider blobs to be potential notes (diff) | |
| download | tgif-67c9b422513ac601c68c191a026af968a2838ae1.tar.xz | |
get_oid_hex_segment(): return 0 on success
Nobody cares about the return value of get_oid_hex_segment() except to
check whether it failed. So just return 0 on success.
And while we're updating its docstring, update it for some argument
renaming that happened a while ago.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes.c')
| -rw-r--r-- | notes.c | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -338,11 +338,10 @@ static void note_tree_free(struct int_node *tree) * Convert a partial SHA1 hex string to the corresponding partial SHA1 value. * - hex - Partial SHA1 segment in ASCII hex format * - hex_len - Length of above segment. Must be multiple of 2 between 0 and 40 - * - sha1 - Partial SHA1 value is written here - * - sha1_len - Max #bytes to store in sha1, Must be >= hex_len / 2, and < 20 - * Returns -1 on error (invalid arguments or invalid SHA1 (not in hex format)). - * Otherwise, returns number of bytes written to sha1 (i.e. hex_len / 2). - * Pads sha1 with NULs up to sha1_len (not included in returned length). + * - oid - Partial SHA1 value is written here + * - oid_len - Max #bytes to store in sha1, Must be >= hex_len / 2, and < 20 + * Return 0 on success or -1 on error (invalid arguments or input not + * in hex format). Pad oid with NULs up to oid_len. */ static int get_oid_hex_segment(const char *hex, unsigned int hex_len, unsigned char *oid, unsigned int oid_len) @@ -359,7 +358,7 @@ static int get_oid_hex_segment(const char *hex, unsigned int hex_len, } for (; i < oid_len; i++) *oid++ = 0; - return len; + return 0; } static int non_note_cmp(const struct non_note *a, const struct non_note *b) @@ -444,7 +443,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, if (get_oid_hex_segment(entry.path, path_len, object_oid.hash + prefix_len, - GIT_SHA1_RAWSZ - prefix_len) < 0) + GIT_SHA1_RAWSZ - prefix_len)) goto handle_non_note; /* entry.path is not a SHA1 */ type = PTR_TYPE_NOTE; @@ -461,7 +460,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, if (get_oid_hex_segment(entry.path, 2, object_oid.hash + prefix_len, - GIT_SHA1_RAWSZ - prefix_len) < 0) + GIT_SHA1_RAWSZ - prefix_len)) goto handle_non_note; /* entry.path is not a SHA1 */ type = PTR_TYPE_SUBTREE; |