From: Adam Spiers <git@adamspiers.org>
To: git list <git@vger.kernel.org>
Subject: [PATCH v4 07/11] pathspec.c: rename newly public functions for clarity
Date: Sun, 6 Jan 2013 16:58:09 +0000 [thread overview]
Message-ID: <1357491493-11619-8-git-send-email-git@adamspiers.org> (raw)
In-Reply-To: <1357491493-11619-1-git-send-email-git@adamspiers.org>
Perform the following function renames to make it explicit that these
pathspec handling functions are for matching against the index, rather
than against a tree or the working directory.
- fill_pathspec_matches() -> add_pathspec_matches_against_index()
- find_used_pathspec() -> find_pathspecs_matching_against_index()
Signed-off-by: Adam Spiers <git@adamspiers.org>
---
builtin/add.c | 4 ++--
pathspec.c | 17 +++++++++--------
pathspec.h | 4 ++--
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index e51ba44..8c3fdf9 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -117,7 +117,7 @@ static char *prune_directory(struct dir_struct *dir, const char **pathspec, int
*dst++ = entry;
}
dir->nr = dst - dir->entries;
- fill_pathspec_matches(pathspec, seen, specs);
+ add_pathspec_matches_against_index(pathspec, seen, specs);
return seen;
}
@@ -415,7 +415,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
path_exclude_check_init(&check, &dir);
if (!seen)
- seen = find_used_pathspec(pathspec);
+ seen = find_pathspecs_matching_against_index(pathspec);
for (i = 0; pathspec[i]; i++) {
if (!seen[i] && pathspec[i][0]
&& !file_exists(pathspec[i])) {
diff --git a/pathspec.c b/pathspec.c
index 1472af8..b73b15c 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -13,9 +13,10 @@
* altogether if seen[] already only contains non-zero entries.
*
* If seen[] has not already been written to, it may make sense
- * to use find_used_pathspec() instead.
+ * to use find_pathspecs_matching_against_index() instead.
*/
-void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
+void add_pathspec_matches_against_index(const char **pathspec,
+ char *seen, int specs)
{
int num_unmatched = 0, i;
@@ -39,12 +40,12 @@ void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
/*
* Finds which of the given pathspecs match items in the index.
*
- * This is a one-shot wrapper around fill_pathspec_matches() which
- * allocates, populates, and returns a seen[] array indicating the
- * nature of the "closest" (i.e. most specific) matches which each of
- * the given pathspecs achieves against all items in the index.
+ * This is a one-shot wrapper around add_pathspec_matches_against_index()
+ * which allocates, populates, and returns a seen[] array indicating the
+ * nature of the "closest" (i.e. most specific) matches which each of the
+ * given pathspecs achieves against all items in the index.
*/
-char *find_used_pathspec(const char **pathspec)
+char *find_pathspecs_matching_against_index(const char **pathspec)
{
char *seen;
int i;
@@ -52,6 +53,6 @@ char *find_used_pathspec(const char **pathspec)
for (i = 0; pathspec[i]; i++)
; /* just counting */
seen = xcalloc(i, 1);
- fill_pathspec_matches(pathspec, seen, i);
+ add_pathspec_matches_against_index(pathspec, seen, i);
return seen;
}
diff --git a/pathspec.h b/pathspec.h
index 1cb1909..3852bc0 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -1,7 +1,7 @@
#ifndef PATHSPEC_H
#define PATHSPEC_H
-extern char *find_used_pathspec(const char **pathspec);
-extern void fill_pathspec_matches(const char **pathspec, char *seen, int specs);
+extern char *find_pathspecs_matching_against_index(const char **pathspec);
+extern void add_pathspec_matches_against_index(const char **pathspec, char *seen, int specs);
#endif /* PATHSPEC_H */
--
1.7.11.7.33.gb8feba5
next prev parent reply other threads:[~2013-01-06 16:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-03 19:17 What's cooking in git.git (Jan 2013, #02; Thu, 3) Junio C Hamano
2013-01-04 17:23 ` Adam Spiers
2013-01-04 21:13 ` as/check-ignore (was Re: What's cooking in git.git (Jan 2013, #02; Thu, 3)) Junio C Hamano
2013-01-06 16:17 ` Adam Spiers
2013-01-06 16:58 ` [PATCH v4 00/11] new git check-ignore sub-command Adam Spiers
2013-01-06 16:58 ` [PATCH v4 01/11] dir.c: use a single struct exclude_list per source of excludes Adam Spiers
2013-01-06 16:58 ` [PATCH v4 02/11] dir.c: keep track of where patterns came from Adam Spiers
2013-01-06 16:58 ` [PATCH v4 03/11] dir.c: provide clear_directory() for reclaiming dir_struct memory Adam Spiers
2013-01-06 16:58 ` [PATCH v4 04/11] dir.c: improve docs for match_pathspec() and match_pathspec_depth() Adam Spiers
2013-01-06 16:58 ` [PATCH v4 05/11] add.c: remove unused argument from validate_pathspec() Adam Spiers
2013-01-06 16:58 ` [PATCH v4 06/11] add.c: move pathspec matchers into new pathspec.c for reuse Adam Spiers
2013-01-06 16:58 ` Adam Spiers [this message]
2013-01-06 16:58 ` [PATCH v4 08/11] add.c: extract check_path_for_gitlink() from treat_gitlinks() " Adam Spiers
2013-01-06 16:58 ` [PATCH v4 09/11] add.c: extract new die_if_path_beyond_symlink() " Adam Spiers
2013-01-06 16:58 ` [PATCH v4 10/11] setup.c: document get_pathspec() Adam Spiers
2013-01-06 16:58 ` [PATCH v4 11/11] add git-check-ignore sub-command Adam Spiers
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357491493-11619-8-git-send-email-git@adamspiers.org \
--to=git@adamspiers.org \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).