31 May 2012 16:41
[PATCH v2 4/6] vcs-svn: prefer strstr over memmem
David Barr <davidbarr <at> google.com>
2012-05-31 14:41:28 GMT
2012-05-31 14:41:28 GMT
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 <davidbarr <at> google.com>
---
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
<at> <at> -163,7 +163,7 <at> <at> 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
RSS Feed