[PATCH 5/9] vcs-svn: use strstr instead of memmem
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Jul 6, 2012, 17:19 UTC
- Message-ID
- <20120706171950.GF31001@burratino>
- In-Reply-To
- <20120706171040.GA31001@burratino>
From: David Barr <davidbarr@google.com> Date: Fri, 1 Jun 2012 00:41:28 +1000
memmem is a GNU extension.
Avoiding it makes the code clearer and makes it easier for projects that don't share git's compat/ code, such as the standalone svn-dump-fast-export project, to reuse the vcs-svn/ library.
Signed-off-by: David Barr <davidbarr@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Clarified description. No other change since v2.
vcs-svn/fast_export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c index b4be91cc..854b328d 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -158,7 +158,7 @@ static int parse_cat_response_line(const char *header, off_t *len) if (ends_with(header, headerlen, " missing")) return error("cat-blob reports missing blob: %s", header); - type = memmem(header, headerlen, " blob ", strlen(" blob ")); + type = strstr(header, " blob "); if (!type) return error("cat-blob header has wrong object type: %s", header); n = strtoumax(type + strlen(" blob "), (char **) &end, 10);
-- 1.7.10.4