From cd0bd8a2eeee42ffbbe32cf83b306f6e8ebb1d82 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 24 Jul 2018 15:34:10 +0200 Subject: [PATCH] connectivity/trivial: rename socket argument in multi_socket_cb() callback "s" might be a good name for a temporary string. But here it's really a file descriptor. Call it "fd". --- src/nm-connectivity.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index 3a3b6f3e8e..d343b5c143 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -336,7 +336,7 @@ typedef struct { } ConCurlSockData; static int -multi_socket_cb (CURL *e_handle, curl_socket_t s, int what, void *userdata, void *socketp) +multi_socket_cb (CURL *e_handle, curl_socket_t fd, int what, void *userdata, void *socketp) { NMConnectivity *self = NM_CONNECTIVITY (userdata); NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self); @@ -345,7 +345,7 @@ multi_socket_cb (CURL *e_handle, curl_socket_t s, int what, void *userdata, void if (what == CURL_POLL_REMOVE) { if (fdp) { - curl_multi_assign (priv->concheck.curl_mhandle, s, NULL); + curl_multi_assign (priv->concheck.curl_mhandle, fd, NULL); nm_clear_g_source (&fdp->ev); g_io_channel_unref (fdp->ch); g_slice_free (ConCurlSockData, fdp); @@ -353,8 +353,8 @@ multi_socket_cb (CURL *e_handle, curl_socket_t s, int what, void *userdata, void } else { if (!fdp) { fdp = g_slice_new0 (ConCurlSockData); - fdp->ch = g_io_channel_unix_new (s); - curl_multi_assign (priv->concheck.curl_mhandle, s, fdp); + fdp->ch = g_io_channel_unix_new (fd); + curl_multi_assign (priv->concheck.curl_mhandle, fd, fdp); } else nm_clear_g_source (&fdp->ev);