diff options
| author | Russell Belfer <rb@github.com> | 2014-04-30 11:16:31 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-04-30 11:16:31 -0700 |
| commit | 8655a8985bcf2891390d464401b198d629edbfc3 (patch) | |
| tree | 342130ee269448aa7b31c37f56df9d2b02f63abb /src/checkout.c | |
| parent | a4f9e1f0d41a9c78b304d3c1b8ef5270c30b208f (diff) | |
| download | libgit2-rb/diff-update-index-stat-cache.tar.gz | |
Fix remaining init_options inconsistenciesrb/diff-update-index-stat-cache
There were a couple of "init_opts()" functions a few more cases
of structure initialization that I somehow missed.
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/checkout.c b/src/checkout.c index 727911694..b869efe2b 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -2240,14 +2240,9 @@ int git_checkout_head( return git_checkout_tree(repo, NULL, opts); } -int git_checkout_init_opts(git_checkout_options* opts, int version) +int git_checkout_init_options(git_checkout_options *opts, unsigned int version) { - if (version != GIT_CHECKOUT_OPTIONS_VERSION) { - giterr_set(GITERR_INVALID, "Invalid version %d for git_checkout_options", version); - return -1; - } else { - git_checkout_options o = GIT_CHECKOUT_OPTIONS_INIT; - memcpy(opts, &o, sizeof(o)); - return 0; - } + GIT_INIT_STRUCTURE_FROM_TEMPLATE( + opts, version, git_checkout_options, GIT_CHECKOUT_OPTIONS_INIT); + return 0; } |