diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2017-10-07 11:25:12 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2017-10-07 11:25:12 +0200 |
| commit | 25fdb3f0c431b87a286537f193c64b1cdae107bc (patch) | |
| tree | 7c0c3c0e1924ec453af098d14446a8acaed9fff5 | |
| parent | 6f8d1eb946c8558085b6d09f4601af2bd1bf24b3 (diff) | |
| download | libgit2-cmn/proxy-options-free.tar.gz | |
proxy: rename the options freeing functioncmn/proxy-options-free
| -rw-r--r-- | src/curl_stream.c | 4 | ||||
| -rw-r--r-- | src/proxy.c | 2 | ||||
| -rw-r--r-- | src/proxy.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/curl_stream.c b/src/curl_stream.c index 4f59eda47..a895cb8bd 100644 --- a/src/curl_stream.c +++ b/src/curl_stream.c @@ -195,7 +195,7 @@ static int curls_set_proxy(git_stream *stream, const git_proxy_options *proxy_op CURLcode res; curl_stream *s = (curl_stream *) stream; - git_proxy_options_free(&s->proxy); + git_proxy_options_clear(&s->proxy); if ((error = git_proxy_options_dup(&s->proxy, proxy_opts)) < 0) return error; @@ -296,7 +296,7 @@ static void curls_free(git_stream *stream) curls_close(stream); git_strarray_free(&s->cert_info_strings); - git_proxy_options_free(&s->proxy); + git_proxy_options_clear(&s->proxy); git_cred_free(s->proxy_cred); git__free(s); } diff --git a/src/proxy.c b/src/proxy.c index 524147c3c..9bc2c7fb1 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -32,7 +32,7 @@ int git_proxy_options_dup(git_proxy_options *tgt, const git_proxy_options *src) return 0; } -void git_proxy_options_free(git_proxy_options *opts) +void git_proxy_options_clear(git_proxy_options *opts) { git__free((char *) opts->url); opts->url = NULL; diff --git a/src/proxy.h b/src/proxy.h index cad8d67c8..f8b5c4b50 100644 --- a/src/proxy.h +++ b/src/proxy.h @@ -12,6 +12,6 @@ #include "git2/proxy.h" extern int git_proxy_options_dup(git_proxy_options *tgt, const git_proxy_options *src); -extern void git_proxy_options_free(git_proxy_options *opts); +extern void git_proxy_options_clear(git_proxy_options *opts); #endif |