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 45/45] Rename field "raw" to "_raw" in struct pathspec
Date: Sun, 9 Jun 2013 13:26:18 +0700 [thread overview]
Message-ID: <1370759178-1709-46-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1370759178-1709-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>
---
builtin/ls-tree.c | 2 +-
dir.c | 4 ++--
pathspec.c | 6 +++---
pathspec.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 1056634..7882352 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -36,7 +36,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/dir.c b/dir.c
index 7e931af..0a79929 100644
--- a/dir.c
+++ b/dir.c
@@ -158,7 +158,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;
}
@@ -1308,7 +1308,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/pathspec.c b/pathspec.c
index e3581da..8ae1f8c 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -376,7 +376,7 @@ void parse_pathspec(struct pathspec *pathspec,
raw[0] = prefix;
raw[1] = NULL;
pathspec->nr = 1;
- pathspec->raw = raw;
+ pathspec->_raw = raw;
return;
}
@@ -386,7 +386,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++) {
@@ -447,7 +447,7 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
~(PATHSPEC_FROMTOP | PATHSPEC_LITERAL),
PATHSPEC_PREFER_CWD,
prefix, pathspec);
- return ps.raw;
+ return ps._raw;
}
void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
diff --git a/pathspec.h b/pathspec.h
index 7608172..5ba42e5 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -15,7 +15,7 @@
#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;
--
1.8.2.83.gc99314b
prev parent reply other threads:[~2013-06-09 6:29 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-09 6:25 [PATCH 00/45] "struct pathspec" conversion and :(glob) Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 01/45] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 02/45] Move struct pathspec and related functions to pathspec.[ch] Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 03/45] pathspec: i18n-ize error strings in pathspec parsing code Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 04/45] pathspec: add copy_pathspec Nguyễn Thái Ngọc Duy
2013-06-09 7:58 ` Eric Sunshine
2013-06-12 18:07 ` Junio C Hamano
2013-06-09 6:25 ` [PATCH 05/45] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-06-10 1:24 ` Eric Sunshine
2013-06-09 6:25 ` [PATCH 06/45] parse_pathspec: save original pathspec for reporting Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 07/45] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} Nguyễn Thái Ngọc Duy
2013-06-10 1:29 ` Eric Sunshine
2013-06-09 6:25 ` [PATCH 08/45] Convert some get_pathspec() calls to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 09/45] parse_pathspec: a special flag for max_depth feature Nguyễn Thái Ngọc Duy
2013-06-10 1:34 ` Eric Sunshine
2013-06-09 6:25 ` [PATCH 10/45] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-06-10 1:36 ` Eric Sunshine
2013-06-09 6:25 ` [PATCH 11/45] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 12/45] parse_pathspec: support prefixing original patterns Nguyễn Thái Ngọc Duy
2013-06-10 1:41 ` Eric Sunshine
2013-06-09 6:25 ` [PATCH 13/45] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-06-10 1:53 ` Eric Sunshine
2013-06-09 6:25 ` [PATCH 14/45] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 15/45] commit: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 16/45] status: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 17/45] rerere: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 18/45] checkout: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 19/45] rm: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 20/45] ls-files: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 21/45] archive: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 22/45] check-ignore: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 23/45] add: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 24/45] reset: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 25/45] line-log: " Nguyễn Thái Ngọc Duy
2013-06-09 6:25 ` [PATCH 26/45] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 27/45] Convert run_add_interactive to use " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 28/45] Convert unmerge_cache to take " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 29/45] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 30/45] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 31/45] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 32/45] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 33/45] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 34/45] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 35/45] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 36/45] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 37/45] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 38/45] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 39/45] parse_pathspec: make sure the prefix part is wildcard-free Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 40/45] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 41/45] Kill limit_pathspec_to_literal() as it's only used by parse_pathspec() Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 42/45] pathspec: support :(literal) syntax for noglob pathspec Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 43/45] pathspec: make --literal-pathspecs disable pathspec magic Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` [PATCH 44/45] pathspec: support :(glob) syntax Nguyễn Thái Ngọc Duy
2013-06-09 6:26 ` Nguyễn Thái Ngọc Duy [this message]
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=1370759178-1709-46-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).