git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 31/31] Rename field "raw" to "_raw" in struct pathspec
Date: Sun, 13 Jan 2013 19:35:39 +0700	[thread overview]
Message-ID: <1358080539-17436-32-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1358080539-17436-1-git-send-email-pclouds@gmail.com>

This patch is essentially no-op. It helps catching new use of this
field though. This field is introduced as an intermediate step for the
pathspec conversion and will be removed eventually. At this stage no
more access sites should be introduced.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 archive.c          | 2 +-
 builtin/add.c      | 2 +-
 builtin/checkout.c | 2 +-
 builtin/ls-tree.c  | 2 +-
 cache.h            | 2 +-
 dir.c              | 4 ++--
 setup.c            | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/archive.c b/archive.c
index ef50d49..d9da58b 100644
--- a/archive.c
+++ b/archive.c
@@ -236,7 +236,7 @@ static void parse_pathspec_arg(const char **pathspec,
 	 */
 	parse_pathspec(&ar_args->pathspec, PATHSPEC_FROMTOP, 0, "", pathspec);
 	if (ar_args->pathspec.nr) {
-		pathspec = ar_args->pathspec.raw;
+		pathspec = ar_args->pathspec._raw;
 		while (*pathspec) {
 			if (!path_exists(ar_args->tree, *pathspec))
 				die("path not found: %s", *pathspec);
diff --git a/builtin/add.c b/builtin/add.c
index 9edab95..a7840c8 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -209,7 +209,7 @@ int interactive_add(int argc, const char **argv, const char *prefix, int patch)
 
 	return run_add_interactive(NULL,
 				   patch ? "--patch" : NULL,
-				   pathspec.raw);
+				   pathspec._raw);
 }
 
 static int edit_patch(int argc, const char **argv, const char *prefix)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index d2fc996..1b413e2 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -253,7 +253,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 
 	if (opts->patch_mode)
 		return run_add_interactive(revision, "--patch=checkout",
-					   opts->pathspec.raw);
+					   opts->pathspec._raw);
 
 	lock_file = xcalloc(1, sizeof(struct lock_file));
 
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index e03aaaf..58899a5 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -35,7 +35,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
 	if (ls_options & LS_RECURSIVE)
 		return 1;
 
-	s = pathspec.raw;
+	s = pathspec._raw;
 	if (!s)
 		return 0;
 
diff --git a/cache.h b/cache.h
index 13cc217..c7a8d28 100644
--- a/cache.h
+++ b/cache.h
@@ -482,7 +482,7 @@ extern int ie_modified(const struct index_state *, struct cache_entry *, struct
 #define PATHSPEC_ONESTAR 1	/* the pathspec pattern sastisfies GFNM_ONESTAR */
 
 struct pathspec {
-	const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
+	const char **_raw; /* get_pathspec() result, not freed by free_pathspec() */
 	int nr;
 	unsigned int has_wildcard:1;
 	unsigned int recursive:1;
diff --git a/dir.c b/dir.c
index 2a1bcb8..efc676c 100644
--- a/dir.c
+++ b/dir.c
@@ -108,7 +108,7 @@ int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
 	len = common_prefix_len(pathspec);
 
 	/* Read the directory and prune it */
-	read_directory(dir, pathspec->nr ? pathspec->raw[0] : "", len, pathspec);
+	read_directory(dir, pathspec->nr ? pathspec->_raw[0] : "", len, pathspec);
 	return len;
 }
 
@@ -1235,7 +1235,7 @@ int read_directory(struct dir_struct *dir, const char *path, int len, const stru
 	if (has_symlink_leading_path(path, len))
 		return dir->nr;
 
-	simplify = create_simplify(pathspec ? pathspec->raw : NULL);
+	simplify = create_simplify(pathspec ? pathspec->_raw : NULL);
 	if (!len || treat_leading_path(dir, path, len, simplify))
 		read_directory_recursive(dir, path, len, 0, simplify);
 	free_simplify(simplify);
diff --git a/setup.c b/setup.c
index b6f419d..69ca047 100644
--- a/setup.c
+++ b/setup.c
@@ -332,7 +332,7 @@ void parse_pathspec(struct pathspec *pathspec,
 		raw[0] = prefix;
 		raw[1] = NULL;
 		pathspec->nr = 1;
-		pathspec->raw = raw;
+		pathspec->_raw = raw;
 		return;
 	}
 
@@ -342,7 +342,7 @@ void parse_pathspec(struct pathspec *pathspec,
 
 	pathspec->nr = n;
 	pathspec->items = item = xmalloc(sizeof(*item) * n);
-	pathspec->raw = argv;
+	pathspec->_raw = argv;
 	prefixlen = prefix ? strlen(prefix) : 0;
 
 	for (i = 0; i < n; i++) {
@@ -372,7 +372,7 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
 {
 	struct pathspec ps;
 	parse_pathspec(&ps, PATHSPEC_FROMTOP, 0, prefix, pathspec);
-	return ps.raw;
+	return ps._raw;
 }
 
 /*
-- 
1.8.0.rc2.23.g1fb49df

  parent reply	other threads:[~2013-01-13 12:39 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-13 12:35 [PATCH v3 00/31] nd/parse-pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 01/31] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 02/31] Add copy_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 03/31] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-01-14  0:05   ` Martin von Zweigbergk
2013-01-14  1:11     ` Duy Nguyen
2013-01-13 12:35 ` [PATCH v3 04/31] parse_pathspec: save original pathspec for reporting Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 05/31] Export parse_pathspec() and convert some get_pathspec() calls Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 06/31] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 07/31] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 08/31] parse_pathspec: add PATHSPEC_EMPTY_MATCH_ALL Nguyễn Thái Ngọc Duy
2013-01-21 23:12   ` Martin von Zweigbergk
2013-01-22  2:46     ` Duy Nguyen
2013-01-13 12:35 ` [PATCH v3 09/31] commit: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 10/31] status: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 11/31] rerere: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 12/31] checkout: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 13/31] rm: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 14/31] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 15/31] ls-files: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 16/31] archive: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 17/31] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 18/31] add: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 19/31] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 20/31] Convert unmerge_cache " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 21/31] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 22/31] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 23/31] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 24/31] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 25/31] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 26/31] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 27/31] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 28/31] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 29/31] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 30/31] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-13 23:21 ` [PATCH v3 00/31] nd/parse-pathspec 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

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

  git send-email \
    --in-reply-to=1358080539-17436-32-git-send-email-pclouds@gmail.com \
    --to=pclouds@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.
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 NNTP newsgroup(s).