rename field "raw" to "_raw" in struct pathspec

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index bdb03f36629fc01f27693791b726fea29fe6d903..1c4f48ea8f2b02c09685e35ace5fc94519447c32 100644 (file)
--- 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 9423fbb627bafcee66e7e8e50148539b15d05f3c..bf224986db04718dcf0bee556214b1e8b6969c86 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -152,7 +152,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;
 }
 
@@ -1293,7 +1293,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 3d1386de851ac4125b4270358006c46182c86553..da802e22a01ca0bc255961c745e14841fa7d2990 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -287,7 +287,7 @@ void parse_pathspec(struct pathspec *pathspec,
                raw[0] = prefix;
                raw[1] = NULL;
                pathspec->nr = 1;
-               pathspec->raw = raw;
+               pathspec->_raw = raw;
                return;
        }
 
@@ -297,7 +297,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++) {
@@ -357,7 +357,7 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
                       PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP,
                       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 31a9c96237d7cb285df87026cf26fe8dfd127d43..0f6739dc677701cd71d8c11e5c2a38c9b3e4f646 100644 (file)
--- a/pathspec.h
+++ b/pathspec.h
@@ -11,7 +11,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;