This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit c0560d3edc6fe51b5064278eeff7f925b895527a Author: Mihai Moldovan <ionic@ionic.de> Date: Fri May 29 10:42:14 2020 +0200 src/x2goclient-{network{,-ssh},openssh-{bugs,version}}.c: use <constant> <op> <var> instead of <var> <op> <constant>. Also add a few parentheses where appropriate. --- src/x2goclient-network-ssh.c | 14 +++++++------- src/x2goclient-network.c | 2 +- src/x2goclient-openssh-bugs.c | 2 +- src/x2goclient-openssh-version.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 1fcf580..913fc6c 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -303,7 +303,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString * const portspec, GError **gerr) { guint16 ret = 0; - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); if (':' == portspec->str[0]) { /* @@ -361,7 +361,7 @@ static GString* x2goclient_network_ssh_sanitize_sockspec (const GString * const static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * const sockspec, const gboolean want_v6, GError **gerr) { GSocketAddress *ret = NULL; - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); /* We're free to sanitize the string now. */ GString *work_sockspec = x2goclient_network_ssh_sanitize_sockspec (sockspec); @@ -528,7 +528,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString * const sockspec, GError **gerr) { GSocketAddress *ret = NULL; - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); /* We're free to sanitize the string now. */ GString *work_sockspec = x2goclient_network_ssh_sanitize_sockspec (sockspec); @@ -713,7 +713,7 @@ gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH *self, GError **ge gboolean ret = FALSE; g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (self), ret); - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); X2GoClientNetwork *parent = X2GOCLIENT_NETWORK (self); X2GoClientNetworkClass *parent_class = X2GOCLIENT_NETWORK_GET_CLASS (parent); @@ -727,7 +727,7 @@ static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork *parent gboolean ret = TRUE; g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (parent), ret); - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (parent); @@ -971,7 +971,7 @@ static gboolean x2goclient_network_ssh_fetch_openssh_version (X2GoClientNetworkS gboolean ret = FALSE; g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (self), ret); - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); GPtrArray *ssh_cmd = g_ptr_array_new_with_free_func (&x2goclient_clear_strings); g_ptr_array_add (ssh_cmd, g_strdup ("ssh")); @@ -1092,7 +1092,7 @@ static gboolean x2goclient_network_ssh_fetch_openssh_version (X2GoClientNetworkS } else { /* gerr is supposed to be empty at that point. */ - g_assert ((gerr == NULL) || (*gerr == NULL)); + g_assert ((NULL == gerr) || (NULL == *gerr)); ret = x2goclient_openssh_version_parse (version, ssh_stderr_str_sanitized, gerr); diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c index d771c06..c416a87 100644 --- a/src/x2goclient-network.c +++ b/src/x2goclient-network.c @@ -174,7 +174,7 @@ gboolean x2goclient_network_connect (X2GoClientNetwork *self, GError **gerr) { X2GoClientNetworkClass *class = X2GOCLIENT_NETWORK_GET_CLASS (self); g_return_val_if_fail (X2GOCLIENT_IS_NETWORK (self), ret); - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); g_return_val_if_fail (class->connect, ret); ret = class->connect (self, gerr); diff --git a/src/x2goclient-openssh-bugs.c b/src/x2goclient-openssh-bugs.c index 51df126..505d142 100644 --- a/src/x2goclient-openssh-bugs.c +++ b/src/x2goclient-openssh-bugs.c @@ -41,7 +41,7 @@ void x2goclient_openssh_bugs_free (X2GoClientOpenSSHBugs *openssh_bugs) { static X2GoClientOpenSSHBugs* x2goclient_openssh_bugs_copy (const X2GoClientOpenSSHBugs * const src) { X2GoClientOpenSSHBugs *dst = NULL; - g_return_val_if_fail (src != NULL, dst); + g_return_val_if_fail ((NULL != src), dst); dst = x2goclient_openssh_bugs_new (); *dst = *src; diff --git a/src/x2goclient-openssh-version.c b/src/x2goclient-openssh-version.c index 030860d..3dc0847 100644 --- a/src/x2goclient-openssh-version.c +++ b/src/x2goclient-openssh-version.c @@ -45,7 +45,7 @@ void x2goclient_openssh_version_free (X2GoClientOpenSSHVersion *openssh_version) static X2GoClientOpenSSHVersion* x2goclient_openssh_version_copy (const X2GoClientOpenSSHVersion * const src) { X2GoClientOpenSSHVersion *dst = NULL; - g_return_val_if_fail (src != NULL, dst); + g_return_val_if_fail ((NULL != src), dst); dst = x2goclient_openssh_version_new (); *dst = *src; @@ -120,7 +120,7 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go _Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_version, const gchar * const version_string, GError **gerr) { _Bool ret = FALSE; - g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret); /* Basic sanity checks on struct and string. */ if (!(openssh_version)) { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git