peel_onion: do not assume length of x_type globals

When we are parsing "rev^{foo}", we check "foo" against the various global type strings, like "commit_type", "tree_type", etc. This is nicely abstracted, but then we destroy the abstraction completely by using magic numbers that must match the length of the type strings. We could avoid these magic numbers by using skip_prefix. But taking a step back, we can realize that using the "commit_type" global is not really buying us anything. It is not ever going to change from being "commit" without causing severe breakage to existing uses. And even if it did change for some crazy reason, we would want to evaluate its effects on the "rev^{}" syntax, anyway. Let's just switch these to using a custom string literal, as we do for "rev^{object}". The resulting code is more robust to changes in the type strings, and is more readable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Sep 3, 2013 at 16:27 UTC c969b6a18d1cde3ffb8a5ca5cd45a57052c2cc95
1 file changed +4 -4
sha1_name.c
+4 -4
@@ -677,13 +677,13 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)
677 return -1;
678
679 sp++; /* beginning of type name, or closing brace for empty */
680 - if (!strncmp(commit_type, sp, 6) && sp[6] == '}')
680 + if (!prefixcmp(sp, "commit}"))
681 expected_type = OBJ_COMMIT;
682 - else if (!strncmp(tag_type, sp, 3) && sp[3] == '}')
682 + else if (!prefixcmp(sp, "tag}"))
683 expected_type = OBJ_TAG;
684 - else if (!strncmp(tree_type, sp, 4) && sp[4] == '}')
684 + else if (!prefixcmp(sp, "tree}"))
685 expected_type = OBJ_TREE;
686 - else if (!strncmp(blob_type, sp, 4) && sp[4] == '}')
686 + else if (!prefixcmp(sp, "blob}"))
687 expected_type = OBJ_BLOB;
688 else if (!prefixcmp(sp, "object}"))
689 expected_type = OBJ_ANY;