From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 1/3] quote: let caller reset buffer for quote_path_relative() Date: Wed, 10 Oct 2012 18:34:52 +0700 Message-ID: <1349868894-3579-2-git-send-email-pclouds@gmail.com> References: <7vk3uzfp3p.fsf@alter.siamese.dyndns.org> <1349868894-3579-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , Jeff King , Johannes Sixt , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Oct 10 13:35:49 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TLuZo-00067B-Qk for gcvg-git-2@plane.gmane.org; Wed, 10 Oct 2012 13:35:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751543Ab2JJLfi convert rfc822-to-quoted-printable (ORCPT ); Wed, 10 Oct 2012 07:35:38 -0400 Received: from mail-da0-f46.google.com ([209.85.210.46]:40573 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751144Ab2JJLfi (ORCPT ); Wed, 10 Oct 2012 07:35:38 -0400 Received: by mail-da0-f46.google.com with SMTP id n41so134109dak.19 for ; Wed, 10 Oct 2012 04:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=BsjGoXS5YdoE17c/lIsGSIdrDzHNi/E5tKMfnkXcVpo=; b=hq3WGoySXPg82Yk1VoS42iF2TkEvCKOzVWMWRrQ3tCrX5JZuWBmvjHI2fJV7tZFYKy FRC2L0ni8/1xGcHRTsqISj6cedqY/FcpoEb4uYTPU3ybdMBoNBAKeSTQSgVrS/o1y7ni nPS9Mcl+ptFJCG+iPe4BN5BigZ8itxEmUyOgelsMwhenVbIiImHmKD7nlxL+nNvv3mKh XCVwheNUFpTv9WiWFI/0a4/FtpuOKNOLkjcOidqsPMLqxhf0uTjzA4KAow4AWh0fvymD ZR/XQLicFyQZjtPusUPukVNuXOiRgYLkUczbY26LoesC/IkS3mIdzvOgDtxK7meUttzK gX3g== Received: by 10.68.212.71 with SMTP id ni7mr72146460pbc.81.1349868937579; Wed, 10 Oct 2012 04:35:37 -0700 (PDT) Received: from pclouds@gmail.com ([115.74.54.82]) by mx.google.com with ESMTPS id ox5sm899566pbc.75.2012.10.10.04.35.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 04:35:36 -0700 (PDT) Received: by pclouds@gmail.com (sSMTP sendmail emulation); Wed, 10 Oct 2012 18:35:28 +0700 X-Mailer: git-send-email 1.7.12.1.406.g6ab07c4 In-Reply-To: <1349868894-3579-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: quote_path_relative() resetting output buffer is sometimes unnecessary as the buffer has never been used, and some other times makes it harder for the caller to use (see builtin/grep.c, the caller has to insert a string after quote_path_relative) Move the buffer reset back to call sites when necessary. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- The answer for Jeff's XXX in his patch, why strbuf_insert() instead of just adding in advance. builtin/clean.c | 2 ++ builtin/grep.c | 2 +- builtin/ls-files.c | 1 + quote.c | 1 - wt-status.c | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 69c1cda..ff633cc 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -149,6 +149,7 @@ int cmd_clean(int argc, const char **argv, const ch= ar *prefix) =20 if (S_ISDIR(st.st_mode)) { strbuf_addstr(&directory, ent->name); + strbuf_reset(&buf); qname =3D quote_path_relative(directory.buf, directory.len, &buf, p= refix); if (show_only && (remove_directories || (matches =3D=3D MATCHED_EXACTLY))) { @@ -171,6 +172,7 @@ int cmd_clean(int argc, const char **argv, const ch= ar *prefix) } else { if (pathspec && !matches) continue; + strbuf_reset(&buf); qname =3D quote_path_relative(ent->name, -1, &buf, prefix); if (show_only) { printf(_("Would remove %s\n"), qname); diff --git a/builtin/grep.c b/builtin/grep.c index 82530a6..377c904 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -376,9 +376,9 @@ static int grep_sha1(struct grep_opt *opt, const un= signed char *sha1, struct strbuf pathbuf =3D STRBUF_INIT; =20 if (opt->relative && opt->prefix_length) { + strbuf_add(&pathbuf, filename, tree_name_len); quote_path_relative(filename + tree_name_len, -1, &pathbuf, opt->prefix); - strbuf_insert(&pathbuf, 0, filename, tree_name_len); } else { strbuf_addstr(&pathbuf, filename); } diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b5434af..1e0cae9 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -395,6 +395,7 @@ int report_path_error(const char *ps_matched, const= char **pathspec, const char if (found_dup) continue; =20 + strbuf_reset(&sb); name =3D quote_path_relative(pathspec[num], -1, &sb, prefix); error("pathspec '%s' did not match any file(s) known to git.", name); diff --git a/quote.c b/quote.c index 911229f..7e23ba9 100644 --- a/quote.c +++ b/quote.c @@ -381,7 +381,6 @@ char *quote_path_relative(const char *in, int len, { struct strbuf sb =3D STRBUF_INIT; const char *rel =3D path_relative(in, len, &sb, prefix, -1); - strbuf_reset(out); quote_c_style_counted(rel, strlen(rel), out, NULL, 0); strbuf_release(&sb); =20 diff --git a/wt-status.c b/wt-status.c index 2a9658b..be8b600 100644 --- a/wt-status.c +++ b/wt-status.c @@ -690,6 +690,7 @@ static void wt_status_print_other(struct wt_status = *s, struct string_list_item *it; const char *path; it =3D &(l->items[i]); + strbuf_reset(&buf); path =3D quote_path(it->string, strlen(it->string), &buf, s->prefix); if (column_active(s->colopts)) { --=20 1.7.12.1.406.g6ab07c4