This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit e1f8b53cf2d7e554baa0d25e1266a944eb95c581 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Aug 19 15:10:47 2019 +0200 src/x2goclient-network-ssh.c: rename err arguments to gerr. --- src/x2goclient-network-ssh.c | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 4090bb7..8353ccb 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -193,10 +193,10 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const return (ret); } -static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString *portspec, GError **err) { +static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString *portspec, GError **gerr) { guint16 ret = 0; - g_return_val_if_fail (err == NULL || *err == NULL, ret); + g_return_val_if_fail (gerr == NULL || *gerr == NULL, ret); if (':' == portspec->str[0]) { /* @@ -223,7 +223,7 @@ static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString *portsp } if (err_msg) { - g_set_error_literal (err, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_PORT_CONV, err_msg); + g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_PORT_CONV, err_msg); err_msg = NULL; } } @@ -247,10 +247,10 @@ static GString* x2goclient_network_ssh_sanitize_sockspec (const GString *sockspe return (ret); } -static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString *sockspec, const gboolean want_v6, GError **err) { +static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString *sockspec, const gboolean want_v6, GError **gerr) { GSocketAddress *ret = NULL; - g_return_val_if_fail (err == NULL || *err == NULL, ret); + g_return_val_if_fail (gerr == NULL || *gerr == NULL, ret); /* We're free to sanitize the string now. */ GString *work_sockspec = x2goclient_network_ssh_sanitize_sockspec (sockspec); @@ -294,7 +294,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * address = g_string_new_len (tmp_start, tmp_end - tmp_start); } else { - g_set_error_literal (err, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_IPV6_CONV, "Found starting bracket, but no matching ending bracket."); + g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_IPV6_CONV, "Found starting bracket, but no matching ending bracket."); int_err = TRUE; } } @@ -386,11 +386,11 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * if (tmp_err) { if (want_v6) { - g_set_error (err, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_IPV6_CONV, "Unable to parse IPv6 address: %s", tmp_err->message); + g_set_error (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_IPV6_CONV, "Unable to parse IPv6 address: %s", tmp_err->message); int_err = TRUE; } else { - g_set_error (err, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_IPV4_CONV, "Unable to parse IPv4 address: %s", tmp_err->message); + g_set_error (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_IPV4_CONV, "Unable to parse IPv4 address: %s", tmp_err->message); int_err = TRUE; } g_clear_error (&tmp_err); @@ -416,10 +416,10 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * return (ret); } -static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString *sockspec, GError **err) { +static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString *sockspec, GError **gerr) { GSocketAddress *ret = NULL; - g_return_val_if_fail (err == NULL || *err == NULL, ret); + g_return_val_if_fail (gerr == NULL || *gerr == NULL, ret); /* We're free to sanitize the string now. */ GString *work_sockspec = x2goclient_network_ssh_sanitize_sockspec (sockspec); @@ -453,7 +453,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GStrin */ const gsize max_len = (sizeof (((struct sockaddr_ho*)(NULL))->sho_addr) - 1); if (max_len < address->len) { - g_set_error (err, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_ALIAS_CONV, "Unable to parse FQDN or alias pseudo-address: name too long, expected at most %" G_GSIZE_FORMAT " bytes, got %" G_GSIZE_FORMAT " bytes.", max_len, address->len); + g_set_error (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_ALIAS_CONV, "Unable to parse FQDN or alias pseudo-address: name too long, expected at most %" G_GSIZE_FORMAT " bytes, got %" G_GSIZE_FORMAT " bytes.", max_len, address->len); int_err = TRUE; } @@ -471,7 +471,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GStrin portspec = NULL; if (tmp_err) { - g_set_error (err, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_ALIAS_CONV, "Unable to parse FQDN or alias pseudo-address: %s", tmp_err->message); + g_set_error (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_ALIAS_CONV, "Unable to parse FQDN or alias pseudo-address: %s", tmp_err->message); g_clear_error (&tmp_err); int_err = TRUE; } @@ -509,15 +509,15 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork g_log (NULL, G_LOG_LEVEL_INFO, "Failed to parse socket specification as UNIX socket.\n" "Continuing with IPv6 parsing."); - GError *tmp_err = NULL; - ret = x2goclient_network_ssh_parse_sockspec_ip (sockspec, TRUE, &tmp_err); + GError *tmp_gerr = NULL; + ret = x2goclient_network_ssh_parse_sockspec_ip (sockspec, TRUE, &tmp_gerr); - if (tmp_err) { + if (tmp_gerr) { g_assert (!ret); - g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like an IPv6 socket, but parsing as such failed: %s", tmp_err->message); + g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like an IPv6 socket, but parsing as such failed: %s", tmp_gerr->message); - g_clear_error (&tmp_err); + g_clear_error (&tmp_gerr); } } @@ -525,15 +525,15 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork g_log (NULL, G_LOG_LEVEL_INFO, "Failed to parse socket specification as IPv6 socket.\n" "Continuing with IPv4 parsing."); - GError *tmp_err = NULL; - ret = x2goclient_network_ssh_parse_sockspec_ip (sockspec, FALSE, &tmp_err); + GError *tmp_gerr = NULL; + ret = x2goclient_network_ssh_parse_sockspec_ip (sockspec, FALSE, &tmp_gerr); - if (tmp_err) { + if (tmp_gerr) { g_assert (!ret); - g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like an IPv4 socket, but parsing as such failed: %s", tmp_err->message); + g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like an IPv4 socket, but parsing as such failed: %s", tmp_gerr->message); - g_clear_error (&tmp_err); + g_clear_error (&tmp_gerr); } } @@ -541,15 +541,15 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork g_log (NULL, G_LOG_LEVEL_INFO, "Failed to parse socket specification as IPv4 socket.\n" "Continuing with FQDN/alias parsing."); - GError *tmp_err = NULL; - ret = x2goclient_network_ssh_parse_sockspec_alias (sockspec, &tmp_err); + GError *tmp_gerr = NULL; + ret = x2goclient_network_ssh_parse_sockspec_alias (sockspec, &tmp_gerr); - if (tmp_err) { + if (tmp_gerr) { g_assert (!ret); - g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like a FQDN or alias socket, but parsing as such failed: %s", tmp_err->message); + g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like a FQDN or alias socket, but parsing as such failed: %s", tmp_gerr->message); - g_clear_error (&tmp_err); + g_clear_error (&tmp_gerr); } } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git