git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: David Michael Barr <davidbarr@google.com>,
	Florian Achleitner <florian.achleitner2.6.31@gmail.com>,
	git@vger.kernel.org
Subject: [PATCH 5/9] vcs-svn: use strstr instead of memmem
Date: Fri, 6 Jul 2012 12:19:50 -0500	[thread overview]
Message-ID: <20120706171950.GF31001@burratino> (raw)
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

  parent reply	other threads:[~2012-07-06 17:20 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-06 21:55 What's cooking in git.git (Jun 2012, #02; Wed, 6) Junio C Hamano
2012-06-06 23:49 ` David Michael Barr
2012-06-07  0:39   ` Jonathan Nieder
2012-06-07  5:25     ` Junio C Hamano
2012-07-06 17:10       ` [GIT PULL] vcs-svn housekeeping Jonathan Nieder
2012-07-06 17:13         ` [PATCH 1/9] vcs-svn: drop no-op reset methods Jonathan Nieder
2012-07-06 17:16         ` [PATCH 2/9] vcs-svn: avoid self-assignment in dummy initialization of pre_off Jonathan Nieder
2012-07-06 17:18         ` [PATCH 3/9] vcs-svn: simplify cleanup in apply_one_window Jonathan Nieder
2012-07-06 17:18         ` [PATCH 4/9] vcs-svn: use constcmp instead of prefixcmp Jonathan Nieder
2012-07-06 17:19         ` Jonathan Nieder [this message]
2012-07-06 17:21         ` [PATCH 6/9] vcs-svn: suppress signed/unsigned comparison warnings Jonathan Nieder
2012-07-06 17:22         ` [PATCH 7/9] vcs-svn: suppress a signed/unsigned comparison warning Jonathan Nieder
2012-07-06 17:25         ` [PATCH 8/9] " Jonathan Nieder
2012-07-06 17:27         ` [PATCH 9/9] vcs-svn: allow 64-bit Prop-Content-Length Jonathan Nieder
2012-07-06 19:41         ` [GIT PULL] vcs-svn housekeeping David Michael Barr
2012-07-06 20:28           ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120706171950.GF31001@burratino \
    --to=jrnieder@gmail.com \
    --cc=davidbarr@google.com \
    --cc=florian.achleitner2.6.31@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).