[X2Go-Commits] [libx2goclient] 12/19: src/x2goclient-network.c: use return value variables.

git-admin at x2go.org git-admin at x2go.org
Fri May 29 11:34:05 CEST 2020


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository libx2goclient.

commit bb7e745fcaadc9f4adfd9ac5d733c2990ce068e8
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 28 14:44:14 2020 +0200

    src/x2goclient-network.c: use return value variables.
---
 src/x2goclient-network.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c
index 21e6796..843d714 100644
--- a/src/x2goclient-network.c
+++ b/src/x2goclient-network.c
@@ -156,22 +156,30 @@ static void x2goclient_network_finalize (GObject *object) {
 
 
 static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *self, const GString *sockspec) {
+  GSocketAddress *ret = NULL;
+
   X2GoClientNetworkClass *class = X2GOCLIENT_NETWORK_GET_CLASS (self);
 
-  g_return_val_if_fail (X2GOCLIENT_IS_NETWORK (self), NULL);
-  g_return_val_if_fail (class->parse_sockspec, NULL);
+  g_return_val_if_fail (X2GOCLIENT_IS_NETWORK (self), ret);
+  g_return_val_if_fail (class->parse_sockspec, ret);
+
+  ret = class->parse_sockspec (self, sockspec);
 
-  return (class->parse_sockspec (self, sockspec));
+  return (ret);
 }
 
 gboolean x2goclient_network_connect (X2GoClientNetwork *self, GError **gerr) {
+  gboolean ret = FALSE;
+
   X2GoClientNetworkClass *class = X2GOCLIENT_NETWORK_GET_CLASS (self);
 
-  g_return_val_if_fail (X2GOCLIENT_IS_NETWORK (self), FALSE);
-  g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), FALSE);
-  g_return_val_if_fail (class->connect, FALSE);
+  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 (class->connect, ret);
+
+  ret = class->connect (self, gerr);
 
-  return (class->connect (self, gerr));
+  return (ret);
 }
 
 static void x2goclient_network_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *param_spec) {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git


More information about the x2go-commits mailing list