[PATCH 1/5] sha1_name: refactor upstream_mark
- From
Jeff King <peff@peff.net>
- Date
- Jan 8, 2014, 09:34 UTC
- Message-ID
- <20140108093424.GA15720@sigill.intra.peff.net>
- In-Reply-To
- <20140108093338.GA15659@sigill.intra.peff.net>
We will be adding new mark types in the future, so separate the suffix data from the logic.
Signed-off-by: Jeff King <peff@peff.net> --- sha1_name.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c index b1873d8..0c50801 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -415,12 +415,12 @@ static int ambiguous_path(const char *path, int len) return slash; } -static inline int upstream_mark(const char *string, int len) +static inline int at_mark(const char *string, int len, + const char **suffix, int nr) { - const char *suffix[] = { "@{upstream}", "@{u}" }; int i; - for (i = 0; i < ARRAY_SIZE(suffix); i++) { + for (i = 0; i < nr; i++) { int suffix_len = strlen(suffix[i]); if (suffix_len <= len && !memcmp(string, suffix[i], suffix_len)) @@ -429,6 +429,12 @@ static inline int upstream_mark(const char *string, int len) return 0; } +static inline int upstream_mark(const char *string, int len) +{ + const char *suffix[] = { "@{upstream}", "@{u}" }; + return at_mark(string, len, suffix, ARRAY_SIZE(suffix)); +} + static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags); static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf);
-- 1.8.5.2.500.g8060133