diff options
| author | Martin Kühl <martin.kuehl@posteo.net> | 2021-11-11 21:55:28 +0100 |
|---|---|---|
| committer | Martin Kühl <martin.kuehl@posteo.net> | 2021-11-11 22:16:45 +0100 |
| commit | de665a430a36aace250845c75094b07cf9c1735c (patch) | |
| tree | 7aaa861f95993a7a6486242dc767e8df715512db | |
| parent | 93d321aba29d3d8b3ea5f2930b128da7c136b8a4 (diff) | |
| download | libgit2-de665a430a36aace250845c75094b07cf9c1735c.tar.gz | |
remote: improve apply_insteadof function signature
| -rw-r--r-- | src/remote.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/remote.c b/src/remote.c index 32973f700..fb9f6f8da 100644 --- a/src/remote.c +++ b/src/remote.c @@ -30,7 +30,7 @@ static int dwim_refspecs(git_vector *out, git_vector *refspecs, git_vector *refs); static int lookup_remote_prune_config(git_remote *remote, git_config *config, const char *name); -char *apply_insteadof(git_config *config, const char *url, int direction, int *matched); +char *apply_insteadof(bool *matched, git_config *config, const char *url, int direction); static int add_refspec_to(git_vector *vector, const char *string, bool is_fetch) { @@ -212,7 +212,7 @@ int git_remote_create_with_opts(git_remote **out, const char *url, const git_rem const git_remote_create_options dummy_opts = GIT_REMOTE_CREATE_OPTIONS_INIT; char *tmp; int error = -1; - int matched; + bool matched; GIT_ASSERT_ARG(out); GIT_ASSERT_ARG(url); @@ -247,8 +247,8 @@ int git_remote_create_with_opts(git_remote **out, const char *url, const git_rem goto on_error; if (opts->repository && !(opts->flags & GIT_REMOTE_CREATE_SKIP_INSTEADOF)) { - remote->url = apply_insteadof(config_ro, canonical_url.ptr, GIT_DIRECTION_FETCH, &matched); - tmp = apply_insteadof(config_ro, canonical_url.ptr, GIT_DIRECTION_PUSH, &matched); + remote->url = apply_insteadof(&matched, config_ro, canonical_url.ptr, GIT_DIRECTION_FETCH); + tmp = apply_insteadof(&matched, config_ro, canonical_url.ptr, GIT_DIRECTION_PUSH); if (matched) { remote->pushurl = tmp; GIT_ERROR_CHECK_ALLOC(remote->pushurl); @@ -466,7 +466,7 @@ int git_remote_lookup(git_remote **out, git_repository *repo, const char *name) const char *val; char *tmp; int error = 0; - int matched; + bool matched; git_config *config; struct refspec_cb_data data = { NULL }; bool optional_setting_found = false, found; @@ -507,9 +507,9 @@ int git_remote_lookup(git_remote **out, git_repository *repo, const char *name) remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; if (found && strlen(val) > 0) { - remote->url = apply_insteadof(config, val, GIT_DIRECTION_FETCH, &matched); + remote->url = apply_insteadof(&matched, config, val, GIT_DIRECTION_FETCH); GIT_ERROR_CHECK_ALLOC(remote->url); - tmp = apply_insteadof(config, val, GIT_DIRECTION_PUSH, &matched); + tmp = apply_insteadof(&matched, config, val, GIT_DIRECTION_PUSH); if (matched) { remote->pushurl = tmp; GIT_ERROR_CHECK_ALLOC(remote->pushurl); @@ -535,7 +535,7 @@ int git_remote_lookup(git_remote **out, git_repository *repo, const char *name) if (remote->pushurl) { git__free(remote->pushurl); } - remote->pushurl = apply_insteadof(config, val, GIT_DIRECTION_FETCH, &matched); + remote->pushurl = apply_insteadof(&matched, config, val, GIT_DIRECTION_FETCH); GIT_ERROR_CHECK_ALLOC(remote->pushurl); } @@ -2736,7 +2736,7 @@ int git_remote_push(git_remote *remote, const git_strarray *refspecs, const git_ #define SUFFIX_FETCH "insteadof" #define SUFFIX_PUSH "pushinsteadof" -char *apply_insteadof(git_config *config, const char *url, int direction, int *matched) +char *apply_insteadof(bool *matched, git_config *config, const char *url, int direction) { size_t match_length, prefix_length, suffix_length; char *replacement = NULL; |