Thanks to visit codestin.com
Credit goes to github.com

Skip to content

attr: rename constants and macros for consistency #5119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2019
Merged

attr: rename constants and macros for consistency #5119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions include/git2/attr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ GIT_BEGIN_DECL
* Then for file `xyz.c` looking up attribute "foo" gives a value for
* which `GIT_ATTR_TRUE(value)` is true.
*/
#define GIT_ATTR_TRUE(attr) (git_attr_value(attr) == GIT_ATTR_TRUE_T)
#define GIT_ATTR_IS_TRUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_TRUE)

/**
* GIT_ATTR_FALSE checks if an attribute is set off. In core git
Expand All @@ -44,7 +44,7 @@ GIT_BEGIN_DECL
* Then for file `zyx.h` looking up attribute "foo" gives a value for
* which `GIT_ATTR_FALSE(value)` is true.
*/
#define GIT_ATTR_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_FALSE_T)
#define GIT_ATTR_IS_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_FALSE)

/**
* GIT_ATTR_UNSPECIFIED checks if an attribute is unspecified. This
Expand All @@ -62,7 +62,7 @@ GIT_BEGIN_DECL
* file `onefile.rb` or looking up "bar" on any file will all give
* `GIT_ATTR_UNSPECIFIED(value)` of true.
*/
#define GIT_ATTR_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_UNSPECIFIED_T)
#define GIT_ATTR_IS_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_UNSPECIFIED)

/**
* GIT_ATTR_HAS_VALUE checks if an attribute is set to a value (as
Expand All @@ -74,17 +74,17 @@ GIT_BEGIN_DECL
* Given this, looking up "eol" for `onefile.txt` will give back the
* string "lf" and `GIT_ATTR_SET_TO_VALUE(attr)` will return true.
*/
#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_T)
#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_STRING)

/**
* Possible states for an attribute
*/
typedef enum {
GIT_ATTR_UNSPECIFIED_T = 0, /**< The attribute has been left unspecified */
GIT_ATTR_TRUE_T, /**< The attribute has been set */
GIT_ATTR_FALSE_T, /**< The attribute has been unset */
GIT_ATTR_VALUE_T, /**< This attribute has a value */
} git_attr_t;
GIT_ATTR_VALUE_UNSPECIFIED = 0, /**< The attribute has been left unspecified */
GIT_ATTR_VALUE_TRUE, /**< The attribute has been set */
GIT_ATTR_VALUE_FALSE, /**< The attribute has been unset */
GIT_ATTR_VALUE_STRING, /**< This attribute has a value */
} git_attr_value_t;

/**
* Return the value type for a given attribute.
Expand All @@ -99,7 +99,7 @@ typedef enum {
* @param attr The attribute
* @return the value type for the attribute
*/
GIT_EXTERN(git_attr_t) git_attr_value(const char *attr);
GIT_EXTERN(git_attr_value_t) git_attr_value(const char *attr);

/**
* Check attribute flags: Reading values from index and working directory.
Expand Down
22 changes: 22 additions & 0 deletions include/git2/deprecated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,28 @@
*/
GIT_BEGIN_DECL

/** @name Deprecated Attribute Constants
*
* These enumeration values are retained for backward compatibility.
* The newer versions of these functions should be preferred in all
* new code.
*
* There is no plan to remove these backward compatibility values at
* this time.
*/
/**@{*/

#define GIT_ATTR_UNSPECIFIED_T GIT_ATTR_VALUE_UNSPECIFIED
#define GIT_ATTR_TRUE_T GIT_ATTR_VALUE_TRUE
#define GIT_ATTR_FALSE_T GIT_ATTR_VALUE_FALSE
#define GIT_ATTR_VALUE_T GIT_ATTR_VALUE_STRING

#define GIT_ATTR_TRUE(attr) GIT_ATTR_IS_TRUE(attr)
#define GIT_ATTR_FALSE(attr) GIT_ATTR_IS_FALSE(attr)
#define GIT_ATTR_UNSPECIFIED(attr) GIT_ATTR_IS_UNSPECIFIED(attr)

/**@}*/

/** @name Deprecated Blob Functions
*
* These functions are retained for backward compatibility. The newer
Expand Down
10 changes: 5 additions & 5 deletions src/attr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ const char *git_attr__true = "[internal]__TRUE__";
const char *git_attr__false = "[internal]__FALSE__";
const char *git_attr__unset = "[internal]__UNSET__";

git_attr_t git_attr_value(const char *attr)
git_attr_value_t git_attr_value(const char *attr)
{
if (attr == NULL || attr == git_attr__unset)
return GIT_ATTR_UNSPECIFIED_T;
return GIT_ATTR_VALUE_UNSPECIFIED;

if (attr == git_attr__true)
return GIT_ATTR_TRUE_T;
return GIT_ATTR_VALUE_TRUE;

if (attr == git_attr__false)
return GIT_ATTR_FALSE_T;
return GIT_ATTR_VALUE_FALSE;

return GIT_ATTR_VALUE_T;
return GIT_ATTR_VALUE_STRING;
}

static int collect_attr_files(
Expand Down
8 changes: 4 additions & 4 deletions src/crlf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ struct crlf_filter {

static git_crlf_t check_crlf(const char *value)
{
if (GIT_ATTR_TRUE(value))
if (GIT_ATTR_IS_TRUE(value))
return GIT_CRLF_TEXT;
else if (GIT_ATTR_FALSE(value))
else if (GIT_ATTR_IS_FALSE(value))
return GIT_CRLF_BINARY;
else if (GIT_ATTR_UNSPECIFIED(value))
else if (GIT_ATTR_IS_UNSPECIFIED(value))
;
else if (strcmp(value, "input") == 0)
return GIT_CRLF_TEXT_INPUT;
Expand All @@ -60,7 +60,7 @@ static git_crlf_t check_crlf(const char *value)

static git_cvar_value check_eol(const char *value)
{
if (GIT_ATTR_UNSPECIFIED(value))
if (GIT_ATTR_IS_UNSPECIFIED(value))
;
else if (strcmp(value, "lf") == 0)
return GIT_EOL_LF;
Expand Down
6 changes: 3 additions & 3 deletions src/diff_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,11 @@ int git_diff_driver_lookup(
attrsession, 0, path, 1, attrs)) < 0)
/* return error below */;

else if (GIT_ATTR_UNSPECIFIED(values[0]))
else if (GIT_ATTR_IS_UNSPECIFIED(values[0]))
/* just use the auto value */;
else if (GIT_ATTR_FALSE(values[0]))
else if (GIT_ATTR_IS_FALSE(values[0]))
*out = &global_drivers[DIFF_DRIVER_BINARY];
else if (GIT_ATTR_TRUE(values[0]))
else if (GIT_ATTR_IS_TRUE(values[0]))
*out = &global_drivers[DIFF_DRIVER_TEXT];

/* otherwise look for driver information in config and build driver */
Expand Down
4 changes: 2 additions & 2 deletions src/filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ static int filter_list_check_attributes(

for (i = 0; !error && i < fdef->nattrs; ++i) {
const char *want = fdef->attrs[fdef->nattrs + i];
git_attr_t want_type, found_type;
git_attr_value_t want_type, found_type;

if (!want)
continue;
Expand All @@ -455,7 +455,7 @@ static int filter_list_check_attributes(

if (want_type != found_type)
error = GIT_ENOTFOUND;
else if (want_type == GIT_ATTR_VALUE_T &&
else if (want_type == GIT_ATTR_VALUE_STRING &&
strcmp(want, strs[i]) &&
strcmp(want, "*"))
error = GIT_ENOTFOUND;
Expand Down
8 changes: 4 additions & 4 deletions src/merge_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,17 +371,17 @@ static int merge_driver_name_for_path(
return error;

/* set: use the built-in 3-way merge driver ("text") */
if (GIT_ATTR_TRUE(value))
if (GIT_ATTR_IS_TRUE(value))
*out = merge_driver_name__text;

/* unset: do not merge ("binary") */
else if (GIT_ATTR_FALSE(value))
else if (GIT_ATTR_IS_FALSE(value))
*out = merge_driver_name__binary;

else if (GIT_ATTR_UNSPECIFIED(value) && default_driver)
else if (GIT_ATTR_IS_UNSPECIFIED(value) && default_driver)
*out = default_driver;

else if (GIT_ATTR_UNSPECIFIED(value))
else if (GIT_ATTR_IS_UNSPECIFIED(value))
*out = merge_driver_name__text;

else
Expand Down
6 changes: 3 additions & 3 deletions tests/attr/attr_expect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ GIT_INLINE(void) attr_check_expected(
{
switch (expected) {
case EXPECT_TRUE:
cl_assert_(GIT_ATTR_TRUE(value), name);
cl_assert_(GIT_ATTR_IS_TRUE(value), name);
break;

case EXPECT_FALSE:
cl_assert_(GIT_ATTR_FALSE(value), name);
cl_assert_(GIT_ATTR_IS_FALSE(value), name);
break;

case EXPECT_UNDEFINED:
cl_assert_(GIT_ATTR_UNSPECIFIED(value), name);
cl_assert_(GIT_ATTR_IS_UNSPECIFIED(value), name);
break;

case EXPECT_STRING:
Expand Down
18 changes: 9 additions & 9 deletions tests/attr/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void test_attr_file__simple_read(void)
assign = get_assign(rule, 0);
cl_assert(assign != NULL);
cl_assert_equal_s("binary", assign->name);
cl_assert(GIT_ATTR_TRUE(assign->value));
cl_assert(GIT_ATTR_IS_TRUE(assign->value));

git_attr_file__free(file);
}
Expand All @@ -53,7 +53,7 @@ void test_attr_file__match_variants(void)
assign = get_assign(rule,0);
cl_assert_equal_s("attr0", assign->name);
cl_assert(assign->name_hash == git_attr_file__name_hash(assign->name));
cl_assert(GIT_ATTR_TRUE(assign->value));
cl_assert(GIT_ATTR_IS_TRUE(assign->value));

rule = get_rule(1);
cl_assert_equal_s("pat1", rule->match.pattern);
Expand Down Expand Up @@ -83,7 +83,7 @@ void test_attr_file__match_variants(void)
cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_HASWILD) != 0);
assign = get_assign(rule,0);
cl_assert_equal_s("attr7", assign->name);
cl_assert(GIT_ATTR_TRUE(assign->value));
cl_assert(GIT_ATTR_IS_TRUE(assign->value));

rule = get_rule(8);
cl_assert_equal_s("pat8 with spaces", rule->match.pattern);
Expand Down Expand Up @@ -144,11 +144,11 @@ void test_attr_file__assign_variants(void)
assign = git_attr_rule__lookup_assignment(rule, "multiple");
cl_assert(assign);
cl_assert_equal_s("multiple", assign->name);
cl_assert(GIT_ATTR_TRUE(assign->value));
cl_assert(GIT_ATTR_IS_TRUE(assign->value));
assign = git_attr_rule__lookup_assignment(rule, "single");
cl_assert(assign);
cl_assert_equal_s("single", assign->name);
cl_assert(GIT_ATTR_FALSE(assign->value));
cl_assert(GIT_ATTR_IS_FALSE(assign->value));
assign = git_attr_rule__lookup_assignment(rule, "values");
cl_assert(assign);
cl_assert_equal_s("values", assign->name);
Expand All @@ -170,7 +170,7 @@ void test_attr_file__assign_variants(void)
assign = git_attr_rule__lookup_assignment(rule, "again");
cl_assert(assign);
cl_assert_equal_s("again", assign->name);
cl_assert(GIT_ATTR_TRUE(assign->value));
cl_assert(GIT_ATTR_IS_TRUE(assign->value));
assign = git_attr_rule__lookup_assignment(rule, "another");
cl_assert(assign);
cl_assert_equal_s("another", assign->name);
Expand All @@ -194,10 +194,10 @@ static void assert_examples(git_attr_file *file)
cl_assert_equal_s("java", assign->value);
assign = git_attr_rule__lookup_assignment(rule, "crlf");
cl_assert_equal_s("crlf", assign->name);
cl_assert(GIT_ATTR_FALSE(assign->value));
cl_assert(GIT_ATTR_IS_FALSE(assign->value));
assign = git_attr_rule__lookup_assignment(rule, "myAttr");
cl_assert_equal_s("myAttr", assign->name);
cl_assert(GIT_ATTR_TRUE(assign->value));
cl_assert(GIT_ATTR_IS_TRUE(assign->value));
assign = git_attr_rule__lookup_assignment(rule, "missing");
cl_assert(assign == NULL);

Expand All @@ -206,7 +206,7 @@ static void assert_examples(git_attr_file *file)
cl_assert(rule->assigns.length == 1);
assign = get_assign(rule, 0);
cl_assert_equal_s("myAttr", assign->name);
cl_assert(GIT_ATTR_UNSPECIFIED(assign->value));
cl_assert(GIT_ATTR_IS_UNSPECIFIED(assign->value));

rule = get_rule(2);
cl_assert_equal_s("README", rule->match.pattern);
Expand Down
14 changes: 7 additions & 7 deletions tests/attr/flags.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void test_attr_flags__bare(void)

cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM, "README.md", "diff"));
cl_assert(GIT_ATTR_UNSPECIFIED(value));
cl_assert(GIT_ATTR_IS_UNSPECIFIED(value));
}

void test_attr_flags__index_vs_workdir(void)
Expand All @@ -29,7 +29,7 @@ void test_attr_flags__index_vs_workdir(void)
cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX,
"README.md", "bar"));
cl_assert(GIT_ATTR_FALSE(value));
cl_assert(GIT_ATTR_IS_FALSE(value));

cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX,
Expand All @@ -39,13 +39,13 @@ void test_attr_flags__index_vs_workdir(void)
cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX,
"README.txt", "foo"));
cl_assert(GIT_ATTR_FALSE(value));
cl_assert(GIT_ATTR_IS_FALSE(value));

/* index then wd */
cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE,
"README.md", "bar"));
cl_assert(GIT_ATTR_TRUE(value));
cl_assert(GIT_ATTR_IS_TRUE(value));

cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE,
Expand All @@ -55,7 +55,7 @@ void test_attr_flags__index_vs_workdir(void)
cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE,
"README.txt", "foo"));
cl_assert(GIT_ATTR_TRUE(value));
cl_assert(GIT_ATTR_IS_TRUE(value));
}

void test_attr_flags__subdir(void)
Expand All @@ -77,7 +77,7 @@ void test_attr_flags__subdir(void)
cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX,
"sub/sub/README.txt", "again"));
cl_assert(GIT_ATTR_TRUE(value));
cl_assert(GIT_ATTR_IS_TRUE(value));

cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX,
Expand All @@ -98,7 +98,7 @@ void test_attr_flags__subdir(void)
cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE,
"sub/sub/README.txt", "again"));
cl_assert(GIT_ATTR_TRUE(value));
cl_assert(GIT_ATTR_IS_TRUE(value));

cl_git_pass(git_attr_get(
&value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE,
Expand Down
2 changes: 1 addition & 1 deletion tests/attr/lookup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void test_attr_lookup__simple(void)
cl_assert(!path.is_dir);

cl_git_pass(git_attr_file__lookup_one(file,&path,"binary",&value));
cl_assert(GIT_ATTR_TRUE(value));
cl_assert(GIT_ATTR_IS_TRUE(value));

cl_git_pass(git_attr_file__lookup_one(file,&path,"missing",&value));
cl_assert(!value);
Expand Down
Loading