This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit c002dd6f06a06ecff1baa04288b64a06cfca3207 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri May 29 10:48:02 2020 +0200 src/x2goclient-{network-ssh,openssh-version}.c: wrap arithmetic and logical expressions in additional parentheses, unless they are the only argument. --- src/x2goclient-network-ssh.c | 16 ++++++++-------- src/x2goclient-openssh-version.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 913fc6c..bb58702 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -401,7 +401,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * */ ++tmp_start; - address = g_string_new_len (tmp_start, tmp_end - tmp_start); + address = g_string_new_len (tmp_start, (tmp_end - tmp_start)); } else { g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_IPV6_CONV, "Found starting bracket, but no matching ending bracket."); @@ -421,7 +421,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * tmp_end = g_strstr_len (tmp_start, -1, ":"); if (tmp_end) { - address = g_string_new_len (tmp_start, tmp_end - tmp_start); + address = g_string_new_len (tmp_start, (tmp_end - tmp_start)); } else { address = g_string_new_len (tmp_start, work_sockspec->len); @@ -446,7 +446,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * GString *filter_work = NULL; if (filter_end) { - filter_work = g_string_new_len (filter_start, filter_end - filter_start); + filter_work = g_string_new_len (filter_start, (filter_end - filter_start)); } else { filter_work = g_string_new (filter_start); @@ -549,7 +549,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GStrin tmp_end = g_strrstr_len (tmp_start, -1, ":"); if (tmp_end) { - address = g_string_new_len (tmp_start, tmp_end - tmp_start); + address = g_string_new_len (tmp_start, (tmp_end - tmp_start)); } else { address = g_string_new_len (tmp_start, work_sockspec->len); @@ -594,7 +594,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GStrin * object. */ sockaddr_ho tmp_sockaddr = { AF_HOST, }; - g_strlcpy (tmp_sockaddr.sho_addr, address->str, max_len + 1); + g_strlcpy (tmp_sockaddr.sho_addr, address->str, (max_len + 1)); tmp_sockaddr.sho_port = port; ret = g_native_socket_address_new (&tmp_sockaddr, sizeof (sockaddr_ho)); } @@ -922,9 +922,9 @@ static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork *parent g_printf ("Launching!\n"); GError *ssh_err = NULL; - self->master_conn = g_subprocess_newv ((const gchar* const*)(ssh_cmd->pdata), G_SUBPROCESS_FLAGS_STDOUT_PIPE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &ssh_err); + self->master_conn = g_subprocess_newv ((const gchar* const*)(ssh_cmd->pdata), (G_SUBPROCESS_FLAGS_STDOUT_PIPE | G_SUBPROCESS_FLAGS_STDERR_PIPE), &ssh_err); - ret = self->master_conn != NULL; + ret = (self->master_conn != NULL); if (ret) { g_printf ("Process started/executed successfully!\n"); @@ -1001,7 +1001,7 @@ static gboolean x2goclient_network_ssh_fetch_openssh_version (X2GoClientNetworkS } GError *ssh_err = NULL; - GSubprocess *ssh_proc = g_subprocess_newv ((const gchar* const*)(ssh_cmd->pdata), G_SUBPROCESS_FLAGS_STDOUT_PIPE | G_SUBPROCESS_FLAGS_STDERR_PIPE, &ssh_err); + GSubprocess *ssh_proc = g_subprocess_newv ((const gchar* const*)(ssh_cmd->pdata), (G_SUBPROCESS_FLAGS_STDOUT_PIPE | G_SUBPROCESS_FLAGS_STDERR_PIPE), &ssh_err); ret = (ssh_proc != NULL); diff --git a/src/x2goclient-openssh-version.c b/src/x2goclient-openssh-version.c index 3dc0847..440e533 100644 --- a/src/x2goclient-openssh-version.c +++ b/src/x2goclient-openssh-version.c @@ -139,7 +139,7 @@ _Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_versio gchar *version_string_work = NULL; if (newline = g_strstr_len (version_string, -1, "\n")) { g_log (NULL, G_LOG_LEVEL_INFO, "Passed version string contains at least one newline, truncating string to first line."); - version_string_work = g_strndup (version_string, newline - version_string); + version_string_work = g_strndup (version_string, (newline - version_string)); } else { version_string_work = g_strdup (version_string); @@ -262,7 +262,7 @@ _Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_versio } /* Copy and convert version number. */ - gchar *tmp_copy = g_strndup (tmp, end_search - tmp); + gchar *tmp_copy = g_strndup (tmp, (end_search - tmp)); SET_VER_COMPONENT (struct_work_copy, num_i, -1); _Bool conv_err = TRUE, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git