From: David Barr Date: Thu, 24 May 2012 14:04:14 GMT Subject: [PATCH 2/7] vcs-svn: prefer strstr over memmem Message-ID: <1337868259-45626-3-git-send-email-davidbarr@google.com> In-Reply-To: <1337868259-45626-1-git-send-email-davidbarr@google.com> The common pattern is to use strstr to match a fixed needle. As a bonus, elimate dependency on memmem for upstream. Signed-off-by: David Barr --- 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 b823b85..cda37dd 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -163,7 +163,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.2