name-rev: use strip_suffix to avoid magic numbers
The manual size computations here are correct, but using strip_suffix makes that obvious, and hopefully communicates the intent of the code more clearly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Sep 24, 2015 at 17:08 UTC
34e02deb60b4db22243d47846eb926de9e0d1cf9
1 file changed
+4
-5
builtin/name-rev.c
+4
-5
@@ -55,16 +55,15 @@ copy_data:
55
parents;
56
parents = parents->next, parent_number++) {
57
if (parent_number > 1) {
58
- int len = strlen(tip_name);
58
+ size_t len;
59
char *new_name;
60
61
- if (len > 2 && !strcmp(tip_name + len - 2, "^0"))
62
- len -= 2;
61
+ strip_suffix(tip_name, "^0", &len);
62
if (generation > 0)
64
- new_name = xstrfmt("%.*s~%d^%d", len, tip_name,
63
+ new_name = xstrfmt("%.*s~%d^%d", (int)len, tip_name,
64
generation, parent_number);
65
else
67
- new_name = xstrfmt("%.*s^%d", len, tip_name,
66
+ new_name = xstrfmt("%.*s^%d", (int)len, tip_name,
67
parent_number);
68
69
name_rev(parents->item, new_name, 0,