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 v6 04/32] path.c: rename vsnpath() to do_git_path() Date: Wed, 9 Jul 2014 14:32:49 +0700 Message-ID: <1404891197-18067-5-git-send-email-pclouds@gmail.com> References: <1404891197-18067-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 , =?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 Jul 09 09:33:55 2014 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 1X4mO2-00032w-EC for gcvg-git-2@plane.gmane.org; Wed, 09 Jul 2014 09:33:54 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754538AbaGIHdu convert rfc822-to-quoted-printable (ORCPT ); Wed, 9 Jul 2014 03:33:50 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:63954 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754448AbaGIHdt (ORCPT ); Wed, 9 Jul 2014 03:33:49 -0400 Received: by mail-pd0-f178.google.com with SMTP id r10so8459669pdi.23 for ; Wed, 09 Jul 2014 00:33:49 -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:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=evQ9G0by1iYQMJPkOGLNlpWH1NMNudo7Eu7Lu6hrVCc=; b=uKZ9SnOHn3tYtzzCc4wVGdfzLQ+bZWehvnPF0q7lq1HL6Q6pTnuHW4pfoqAOrekpzT 7+qvvD6Kqs6wgGxcwx1rTYZPyPcB1RGBSVt0qbpP0jowQySKxt+0+NdncBfHCLDXAHCF 9Q/fg4aHcVKA+XDwr3WtDDGDP/WcIiVeU2/siB22DRDCUBCXNMfTgXGAKqbL6hFZ7pFA /iZrez9IAnCpBmx6gmORcoJjXIep+bXtr6olmSNTGyRf0WSmQcyf48MjnPYStZXV1P2h i2dn7ngVLnRcpGe+Vd6DAFPc8HgkWFAhIr+00i7qResVQXW82oPIbEnUup2x3Sc2hQ6m ZuXQ== X-Received: by 10.67.14.231 with SMTP id fj7mr656487pad.115.1404891229021; Wed, 09 Jul 2014 00:33:49 -0700 (PDT) Received: from lanh ([115.73.209.165]) by mx.google.com with ESMTPSA id f5sm27272682pdl.30.2014.07.09.00.33.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jul 2014 00:33:48 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Wed, 09 Jul 2014 14:33:45 +0700 X-Mailer: git-send-email 1.9.1.346.ga2b5940 In-Reply-To: <1404891197-18067-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: The name vsnpath() gives an impression that this is general path handling function. It's not. This is the underlying implementation of git_path(), git_pathdup() and strbuf_git_path() which will prefix $GIT_DIR in the result string. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- path.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/path.c b/path.c index e545064..2cb2e61 100644 --- a/path.c +++ b/path.c @@ -60,7 +60,7 @@ char *mksnpath(char *buf, size_t n, const char *fmt, = =2E..) return cleanup_path(buf); } =20 -static void vsnpath(struct strbuf *buf, const char *fmt, va_list args) +static void do_git_path(struct strbuf *buf, const char *fmt, va_list a= rgs) { const char *git_dir =3D get_git_dir(); strbuf_addstr(buf, git_dir); @@ -74,7 +74,7 @@ void strbuf_git_path(struct strbuf *sb, const char *f= mt, ...) { va_list args; va_start(args, fmt); - vsnpath(sb, fmt, args); + do_git_path(sb, fmt, args); va_end(args); } =20 @@ -83,7 +83,7 @@ char *git_pathdup(const char *fmt, ...) struct strbuf path =3D STRBUF_INIT; va_list args; va_start(args, fmt); - vsnpath(&path, fmt, args); + do_git_path(&path, fmt, args); va_end(args); return strbuf_detach(&path, NULL); } @@ -114,7 +114,7 @@ const char *git_path(const char *fmt, ...) struct strbuf *pathname =3D get_pathname(); va_list args; va_start(args, fmt); - vsnpath(pathname, fmt, args); + do_git_path(pathname, fmt, args); va_end(args); return pathname->buf; } --=20 1.9.1.346.ga2b5940