зеркало из https://github.com/microsoft/git.git
strbuf: remove prefixcmp() and suffixcmp()
As starts_with() and ends_with() have been used to replace prefixcmp() and suffixcmp() respectively, we can now remove them. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
5955654823
Коммит
666c90b629
|
@ -351,9 +351,7 @@ extern void set_error_routine(void (*routine)(const char *err, va_list params));
|
|||
extern void set_die_is_recursing_routine(int (*routine)(void));
|
||||
|
||||
extern int starts_with(const char *str, const char *prefix);
|
||||
extern int prefixcmp(const char *str, const char *prefix);
|
||||
extern int ends_with(const char *str, const char *suffix);
|
||||
extern int suffixcmp(const char *str, const char *suffix);
|
||||
|
||||
static inline const char *skip_prefix(const char *str, const char *prefix)
|
||||
{
|
||||
|
|
18
strbuf.c
18
strbuf.c
|
@ -10,15 +10,6 @@ int starts_with(const char *str, const char *prefix)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int prefixcmp(const char *str, const char *prefix)
|
||||
{
|
||||
for (; ; str++, prefix++)
|
||||
if (!*prefix)
|
||||
return 0;
|
||||
else if (*str != *prefix)
|
||||
return (unsigned char)*prefix - (unsigned char)*str;
|
||||
}
|
||||
|
||||
int ends_with(const char *str, const char *suffix)
|
||||
{
|
||||
int len = strlen(str), suflen = strlen(suffix);
|
||||
|
@ -28,15 +19,6 @@ int ends_with(const char *str, const char *suffix)
|
|||
return !strcmp(str + len - suflen, suffix);
|
||||
}
|
||||
|
||||
int suffixcmp(const char *str, const char *suffix)
|
||||
{
|
||||
int len = strlen(str), suflen = strlen(suffix);
|
||||
if (len < suflen)
|
||||
return -1;
|
||||
else
|
||||
return strcmp(str + len - suflen, suffix);
|
||||
}
|
||||
|
||||
/*
|
||||
* Used as the default ->buf value, so that people can always assume
|
||||
* buf is non NULL and ->buf is NUL terminated even for a freshly
|
||||
|
|
Загрузка…
Ссылка в новой задаче