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>
Michael Haggerty committed
Aug 26, 2017 at 10:28 UTC
67c9b422513ac601c68c191a026af968a2838ae1
1 file changed
+7
-8
notes.c
+7
-8
@@ -338,11 +338,10 @@ static void note_tree_free(struct int_node *tree)
338
* Convert a partial SHA1 hex string to the corresponding partial SHA1 value.
339
* - hex - Partial SHA1 segment in ASCII hex format
340
* - hex_len - Length of above segment. Must be multiple of 2 between 0 and 40
341
- * - sha1 - Partial SHA1 value is written here
342
- * - sha1_len - Max #bytes to store in sha1, Must be >= hex_len / 2, and < 20
343
- * Returns -1 on error (invalid arguments or invalid SHA1 (not in hex format)).
344
- * Otherwise, returns number of bytes written to sha1 (i.e. hex_len / 2).
345
- * Pads sha1 with NULs up to sha1_len (not included in returned length).
341
+ * - oid - Partial SHA1 value is written here
342
+ * - oid_len - Max #bytes to store in sha1, Must be >= hex_len / 2, and < 20
343
+ * Return 0 on success or -1 on error (invalid arguments or input not
344
+ * in hex format). Pad oid with NULs up to oid_len.
345
*/
346
static int get_oid_hex_segment(const char *hex, unsigned int hex_len,
347
unsigned char *oid, unsigned int oid_len)
@@ -359,7 +358,7 @@ static int get_oid_hex_segment(const char *hex, unsigned int hex_len,
358
}
359
for (; i < oid_len; i++)
360
*oid++ = 0;
362
- return len;
361
+ return 0;
362
}
363
364
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,
443
444
if (get_oid_hex_segment(entry.path, path_len,
445
object_oid.hash + prefix_len,
447
- GIT_SHA1_RAWSZ - prefix_len) < 0)
446
+ GIT_SHA1_RAWSZ - prefix_len))
447
goto handle_non_note; /* entry.path is not a SHA1 */
448
449
type = PTR_TYPE_NOTE;
@@ -461,7 +460,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
460
461
if (get_oid_hex_segment(entry.path, 2,
462
object_oid.hash + prefix_len,
464
- GIT_SHA1_RAWSZ - prefix_len) < 0)
463
+ GIT_SHA1_RAWSZ - prefix_len))
464
goto handle_non_note; /* entry.path is not a SHA1 */
465
466
type = PTR_TYPE_SUBTREE;