diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2020-02-01 11:38:08 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2020-02-01 11:38:08 +0100 |
| commit | c11ac34f4c565018aa1a5fcbdef72d5b8b2f6070 (patch) | |
| tree | f4e148a531528ae69a477199a0e0c6c31989c8a8 | |
| parent | 3d03900e910cb3d9c0af5e27104d6a4748f8e0b8 (diff) | |
| download | NetworkManager-c11ac34f4c565018aa1a5fcbdef72d5b8b2f6070.tar.gz | |
all: remove wrong CURL option initialization
curl_multi_setopt() accepts CURLMOPT_* options, not CURLOPT_*
ones. Found by GCC 10:
clients/cloud-setup/nm-http-client.c:700:38: error: implicit conversion from ‘enum <anonymous>’ to ‘CURLMoption’ [-Werror=enum-conversion]
700 | curl_multi_setopt (priv->mhandle, CURLOPT_VERBOSE, 1);
Fixes: 69f048bf0ca3 ('cloud-setup: add tool for automatic IP configuration in cloud')
| -rw-r--r-- | clients/cloud-setup/nm-http-client.c | 2 | ||||
| -rw-r--r-- | src/nm-connectivity.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c index 9ceb26c3b2..35f41fe775 100644 --- a/clients/cloud-setup/nm-http-client.c +++ b/clients/cloud-setup/nm-http-client.c @@ -696,8 +696,6 @@ constructed (GObject *object) curl_multi_setopt (priv->mhandle, CURLMOPT_SOCKETDATA, self); curl_multi_setopt (priv->mhandle, CURLMOPT_TIMERFUNCTION, _mhandle_timerfunction_cb); curl_multi_setopt (priv->mhandle, CURLMOPT_TIMERDATA, self); - if (NM_CURL_DEBUG) - curl_multi_setopt (priv->mhandle, CURLOPT_VERBOSE, 1); } G_OBJECT_CLASS (nm_http_client_parent_class)->constructed (object); diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index 207af583ce..a7a827797c 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -690,7 +690,6 @@ do_curl_request (NMConnectivityCheckHandle *cb_data) curl_multi_setopt (mhandle, CURLMOPT_SOCKETDATA, cb_data); curl_multi_setopt (mhandle, CURLMOPT_TIMERFUNCTION, multi_timer_cb); curl_multi_setopt (mhandle, CURLMOPT_TIMERDATA, cb_data); - curl_multi_setopt (mhandle, CURLOPT_VERBOSE, 1); switch (cb_data->addr_family) { case AF_INET: |