diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-07 19:02:58 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-07 19:02:58 +0100 |
| commit | 041cd4a23ff4fb17e7e9250521f78819636afbfd (patch) | |
| tree | 15a87fe64d74d9974d17803e0e573fe56e812686 /src/checkout.c | |
| parent | 5a6de908f6a89e032f865f7031b0a697c3ecfc4f (diff) | |
| parent | aa17c3c63c3e31155015572cf208d89def9fce0c (diff) | |
| download | libgit2-041cd4a23ff4fb17e7e9250521f78819636afbfd.tar.gz | |
Merge pull request #2028 from libgit2/options-names
Rename options structures
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/checkout.c b/src/checkout.c index 4ef8da076..5dd4ec71c 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -47,7 +47,7 @@ enum { typedef struct { git_repository *repo; git_diff *diff; - git_checkout_opts opts; + git_checkout_options opts; bool opts_free_baseline; char *pfx; git_index *index; @@ -1144,7 +1144,7 @@ static int blob_content_to_file( const char *path, const char * hint_path, mode_t entry_filemode, - git_checkout_opts *opts) + git_checkout_options *opts) { int error = 0; mode_t file_mode = opts->file_mode ? opts->file_mode : entry_filemode; @@ -1856,7 +1856,7 @@ static void checkout_data_clear(checkout_data *data) static int checkout_data_init( checkout_data *data, git_iterator *target, - const git_checkout_opts *proposed) + const git_checkout_options *proposed) { int error = 0; git_repository *repo = git_iterator_owner(target); @@ -1875,12 +1875,12 @@ static int checkout_data_init( data->repo = repo; GITERR_CHECK_VERSION( - proposed, GIT_CHECKOUT_OPTS_VERSION, "git_checkout_opts"); + proposed, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options"); if (!proposed) - GIT_INIT_STRUCTURE(&data->opts, GIT_CHECKOUT_OPTS_VERSION); + GIT_INIT_STRUCTURE(&data->opts, GIT_CHECKOUT_OPTIONS_VERSION); else - memmove(&data->opts, proposed, sizeof(git_checkout_opts)); + memmove(&data->opts, proposed, sizeof(git_checkout_options)); if (!data->opts.target_directory) data->opts.target_directory = git_repository_workdir(repo); @@ -2000,7 +2000,7 @@ cleanup: int git_checkout_iterator( git_iterator *target, - const git_checkout_opts *opts) + const git_checkout_options *opts) { int error = 0; git_iterator *baseline = NULL, *workdir = NULL; @@ -2106,7 +2106,7 @@ cleanup: int git_checkout_index( git_repository *repo, git_index *index, - const git_checkout_opts *opts) + const git_checkout_options *opts) { int error; git_iterator *index_i; @@ -2141,7 +2141,7 @@ int git_checkout_index( int git_checkout_tree( git_repository *repo, const git_object *treeish, - const git_checkout_opts *opts) + const git_checkout_options *opts) { int error; git_tree *tree = NULL; @@ -2189,19 +2189,19 @@ int git_checkout_tree( int git_checkout_head( git_repository *repo, - const git_checkout_opts *opts) + const git_checkout_options *opts) { assert(repo); return git_checkout_tree(repo, NULL, opts); } -int git_checkout_init_opts(git_checkout_opts* opts, int version) +int git_checkout_init_opts(git_checkout_options* opts, int version) { - if (version != GIT_CHECKOUT_OPTS_VERSION) { - giterr_set(GITERR_INVALID, "Invalid version %d for git_checkout_opts", version); + if (version != GIT_CHECKOUT_OPTIONS_VERSION) { + giterr_set(GITERR_INVALID, "Invalid version %d for git_checkout_options", version); return -1; } else { - git_checkout_opts o = GIT_CHECKOUT_OPTS_INIT; + git_checkout_options o = GIT_CHECKOUT_OPTIONS_INIT; memcpy(opts, &o, sizeof(o)); return 0; } |