git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 5/5] strbuf: remove prefixcmp() and suffixcmp()

From
Christian Couder <chriscool@tuxfamily.org>
Date
Dec 1, 2013, 07:49 UTC
Message-ID
<20131201074919.3042.68588.chriscool@tuxfamily.org>
In-Reply-To
<20131201074818.3042.57357.chriscool@tuxfamily.org>

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>
---
 git-compat-util.h |  2 --
 strbuf.c          | 18 ------------------
 2 files changed, 20 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index b73916b..c4c01e7 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -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)
 {
diff --git a/strbuf.c b/strbuf.c
index 83caf4a..ee96dcf 100644
--- a/strbuf.c
+++ b/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
-- 
1.8.4.1.561.g12affca
Previous: Christian CouderNext: Jeff King
Message 5 of 17 in “use starts_with() and ends_with()”
  1. 0/5 use starts_with() and ends_with()Christian Couder, Dec 1, 2013
  2. 1/5 environment: normalize use of prefixcmp() by removing " != 0"Christian Couder, Dec 1, 2013
  3. 2/5 builtin/remote: remove postfixcmp() and use suffixcmp() insteadChristian Couder, Dec 1, 2013
  4. 3/5 strbuf: introduce starts_with() and ends_with()Christian Couder, Dec 1, 2013
  5. 5/5 strbuf: remove prefixcmp() and suffixcmp()Christian Couder, Dec 1, 2013
  6. Jeff KingDec 2, 2013
  7. Junio C HamanoDec 2, 2013
  8. Christian CouderDec 2, 2013
  9. Antoine PelisseDec 2, 2013
  10. Christian CouderDec 3, 2013
  11. Jeff KingDec 3, 2013
  12. Christian CouderDec 3, 2013
  13. Jeff KingDec 4, 2013
  14. Junio C HamanoDec 4, 2013
  15. Junio C HamanoDec 4, 2013
  16. Christian CouderDec 5, 2013
  17. Junio C HamanoDec 5, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.