diff options
| -rw-r--r-- | builtin/ls-tree.c | 2 | ||||
| -rw-r--r-- | dir.c | 4 | ||||
| -rw-r--r-- | pathspec.c | 6 | ||||
| -rw-r--r-- | pathspec.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index bdb03f3..1c4f48e 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; @@ -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); @@ -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) @@ -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; |