diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-02-19 11:09:54 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-02-19 11:09:54 -0500 |
| commit | 795eaccd667ce24c290b6211ca0c6a84f84e7c2b (patch) | |
| tree | bdef91425a91ee616f3358630ee9f2a25ede27fd /include/git2 | |
| parent | d4cf167515d3ed7b27c1358fc2e19b9caf66e8ad (diff) | |
| download | libgit2-795eaccd667ce24c290b6211ca0c6a84f84e7c2b.tar.gz | |
git_filter_opt_t -> git_filter_flag_t
For consistency with the rest of the library, where an opt is an
options *structure*.
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/filter.h | 10 | ||||
| -rw-r--r-- | include/git2/sys/filter.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/git2/filter.h b/include/git2/filter.h index c0aaf1508..dc59e6341 100644 --- a/include/git2/filter.h +++ b/include/git2/filter.h @@ -39,9 +39,9 @@ typedef enum { * Filter option flags. */ typedef enum { - GIT_FILTER_OPT_DEFAULT = 0u, - GIT_FILTER_OPT_ALLOW_UNSAFE = (1u << 0), -} git_filter_opt_t; + GIT_FILTER_DEFAULT = 0u, + GIT_FILTER_ALLOW_UNSAFE = (1u << 0), +} git_filter_flag_t; /** * A filter that can transform file data @@ -83,7 +83,7 @@ typedef struct git_filter_list git_filter_list; * @param blob The blob to which the filter will be applied (if known) * @param path Relative path of the file to be filtered * @param mode Filtering direction (WT->ODB or ODB->WT) - * @param options Combination of `git_filter_opt_t` flags + * @param flags Combination of `git_filter_flag_t` flags * @return 0 on success (which could still return NULL if no filters are * needed for the requested file), <0 on error */ @@ -93,7 +93,7 @@ GIT_EXTERN(int) git_filter_list_load( git_blob *blob, /* can be NULL */ const char *path, git_filter_mode_t mode, - uint32_t options); + uint32_t flags); /** * Apply filter list to a data buffer. diff --git a/include/git2/sys/filter.h b/include/git2/sys/filter.h index 9b560fa75..5fd8d5566 100644 --- a/include/git2/sys/filter.h +++ b/include/git2/sys/filter.h @@ -123,9 +123,9 @@ GIT_EXTERN(const git_oid *) git_filter_source_id(const git_filter_source *src); GIT_EXTERN(git_filter_mode_t) git_filter_source_mode(const git_filter_source *src); /** - * Get the combination git_filter_opt_t options to be applied + * Get the combination git_filter_flag_t options to be applied */ -GIT_EXTERN(uint32_t) git_filter_source_options(const git_filter_source *src); +GIT_EXTERN(uint32_t) git_filter_source_flags(const git_filter_source *src); /* * struct git_filter |