Skip to content
/ git Public
forked from git/git

Commit

Permalink
Rename git_checkattr() to git_check_attr()
Browse files Browse the repository at this point in the history
Suggested by: Junio Hamano <gitster@pobox.com>

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
mhagger authored and gitster committed Aug 4, 2011
1 parent ca64d06 commit d932f4e
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions Documentation/technical/api-gitattributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Data Structure
`struct git_attr_check`::

This structure represents a set of attributes to check in a call
to `git_checkattr()` function, and receives the results.
to `git_check_attr()` function, and receives the results.


Attribute Values
Expand Down Expand Up @@ -52,7 +52,7 @@ Querying Specific Attributes
attributes you would want to check. To populate this array, you would
need to define necessary attributes by calling `git_attr()` function.

* Call `git_checkattr()` to check the attributes for the path.
* Call `git_check_attr()` to check the attributes for the path.

* Inspect `git_attr_check` structure to see how each of the attribute in
the array is defined for the path.
Expand All @@ -78,13 +78,13 @@ static void setup_check(void)
}
------------

. Call `git_checkattr()` with the prepared array of `struct git_attr_check`:
. Call `git_check_attr()` with the prepared array of `struct git_attr_check`:

------------
const char *path;

setup_check();
git_checkattr(path, ARRAY_SIZE(check), check);
git_check_attr(path, ARRAY_SIZE(check), check);
------------

. Act on `.value` member of the result, left in `check[]`:
Expand Down
2 changes: 1 addition & 1 deletion archive.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
path_without_prefix = path.buf + args->baselen;

setup_archive_check(check);
if (!git_checkattr(path_without_prefix, ARRAY_SIZE(check), check)) {
if (!git_check_attr(path_without_prefix, ARRAY_SIZE(check), check)) {
if (ATTR_TRUE(check[0].value))
return 0;
convert = ATTR_TRUE(check[1].value);
Expand Down
2 changes: 1 addition & 1 deletion attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ static void collect_all_attrs(const char *path)
rem = fill(path, pathlen, stk, rem);
}

int git_checkattr(const char *path, int num, struct git_attr_check *check)
int git_check_attr(const char *path, int num, struct git_attr_check *check)
{
int i;

Expand Down
4 changes: 2 additions & 2 deletions attr.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern const char git_attr__false[];
#define ATTR_UNSET(v) ((v) == NULL)

/*
* Send one or more git_attr_check to git_checkattr(), and
* Send one or more git_attr_check to git_check_attr(), and
* each 'value' member tells what its value is.
* Unset one is returned as NULL.
*/
Expand All @@ -36,7 +36,7 @@ struct git_attr_check {
*/
char *git_attr_name(struct git_attr *);

int git_checkattr(const char *path, int, struct git_attr_check *);
int git_check_attr(const char *path, int, struct git_attr_check *);

/*
* Retrieve all attributes that apply to the specified path. *num
Expand Down
4 changes: 2 additions & 2 deletions builtin/check-attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ static void check_attr(int cnt, struct git_attr_check *check,
const char *file)
{
if (check != NULL) {
if (git_checkattr(file, cnt, check))
die("git_checkattr died");
if (git_check_attr(file, cnt, check))
die("git_check_attr died");
output_attr(cnt, check, file);
} else {
if (git_all_attrs(file, &cnt, &check))
Expand Down
2 changes: 1 addition & 1 deletion builtin/pack-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ static int no_try_delta(const char *path)
struct git_attr_check check[1];

setup_delta_attr_check(check);
if (git_checkattr(path, ARRAY_SIZE(check), check))
if (git_check_attr(path, ARRAY_SIZE(check), check))
return 0;
if (ATTR_FALSE(check->value))
return 1;
Expand Down
2 changes: 1 addition & 1 deletion convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ static void convert_attrs(struct conv_attrs *ca, const char *path)
git_config(read_convert_config, NULL);
}

if (!git_checkattr(path, NUM_CONV_ATTRS, ccheck)) {
if (!git_check_attr(path, NUM_CONV_ATTRS, ccheck)) {
ca->crlf_action = git_path_check_crlf(path, ccheck + 4);
if (ca->crlf_action == CRLF_GUESS)
ca->crlf_action = git_path_check_crlf(path, ccheck + 0);
Expand Down
4 changes: 2 additions & 2 deletions ll-merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ static int git_path_check_merge(const char *path, struct git_attr_check check[2]
check[0].attr = git_attr("merge");
check[1].attr = git_attr("conflict-marker-size");
}
return git_checkattr(path, 2, check);
return git_check_attr(path, 2, check);
}

static void normalize_file(mmfile_t *mm, const char *path)
Expand Down Expand Up @@ -387,7 +387,7 @@ int ll_merge_marker_size(const char *path)

if (!check.attr)
check.attr = git_attr("conflict-marker-size");
if (!git_checkattr(path, 1, &check) && check.value) {
if (!git_check_attr(path, 1, &check) && check.value) {
marker_size = atoi(check.value);
if (marker_size <= 0)
marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
Expand Down
2 changes: 1 addition & 1 deletion userdiff.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ struct userdiff_driver *userdiff_find_by_path(const char *path)

if (!path)
return NULL;
if (git_checkattr(path, 1, &check))
if (git_check_attr(path, 1, &check))
return NULL;

if (ATTR_TRUE(check.value))
Expand Down
2 changes: 1 addition & 1 deletion ws.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ unsigned whitespace_rule(const char *pathname)
struct git_attr_check attr_whitespace_rule;

setup_whitespace_attr_check(&attr_whitespace_rule);
if (!git_checkattr(pathname, 1, &attr_whitespace_rule)) {
if (!git_check_attr(pathname, 1, &attr_whitespace_rule)) {
const char *value;

value = attr_whitespace_rule.value;
Expand Down

0 comments on commit d932f4e

Please sign in to comment.