[X2Go-Commits] [libx2goclient] 08/44: misc src/: constify all function parameters.

17 Sep 2020

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

x2go pushed a commit to branch master
in repository libx2goclient.

commit c57d50c7fe6d116432729737a81671dbd98c1c12
Author: Mihai Moldovan <ionic@ionic.de>
Date:   Thu Jul 30 11:55:31 2020 +0200

    misc src/: constify all function parameters.
    
    This does not change the data, only makes the parameters themselves
    const.
    
    I'd like to avoid changing these, so making them const sounds like a
    good idea.
---
 src/test/sshtest.c               |  2 +-
 src/x2goclient-network-ssh.c     | 56 ++++++++++++++++++++--------------------
 src/x2goclient-network-ssh.h     |  4 +--
 src/x2goclient-network.c         | 30 ++++++++++-----------
 src/x2goclient-network.h         |  6 ++---
 src/x2goclient-openssh-bugs.c    |  4 +--
 src/x2goclient-openssh-bugs.h    |  4 +--
 src/x2goclient-openssh-version.c |  6 ++---
 src/x2goclient-openssh-version.h |  6 ++---
 src/x2goclient-utils.c           |  4 +--
 src/x2goclient-utils.h           |  6 ++---
 11 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/test/sshtest.c b/src/test/sshtest.c
index 770cec7..21c23b1 100644
--- a/src/test/sshtest.c
+++ b/src/test/sshtest.c
@@ -41,7 +41,7 @@
 
 #define _(String) gettext (String)
 
-int main (int argc, char **argv) {
+int main (const int argc, const char * const * const argv) {
   int ret = EXIT_FAILURE;
 
   setlocale (LC_MESSAGES, "");
diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c
index 3bdedd2..9f11df6 100644
--- a/src/x2goclient-network-ssh.c
+++ b/src/x2goclient-network-ssh.c
@@ -63,13 +63,13 @@ struct _X2GoClientNetworkOptionsSSH {
 
 G_DEFINE_TYPE (X2GoClientNetworkOptionsSSH, x2goclient_network_options_ssh, X2GOCLIENT_TYPE_NETWORK_OPTIONS);
 
-static void x2goclient_network_options_ssh_class_init (X2GoClientNetworkOptionsSSHClass *klass) {
+static void x2goclient_network_options_ssh_class_init (X2GoClientNetworkOptionsSSHClass * const klass) {
 }
 
-static void x2goclient_network_options_ssh_init (X2GoClientNetworkOptionsSSH *self) {
+static void x2goclient_network_options_ssh_init (X2GoClientNetworkOptionsSSH * const self) {
 }
 
-GPtrArray* x2goclient_network_options_ssh_to_array (X2GoClientNetworkOptionsSSH *self) {
+GPtrArray* x2goclient_network_options_ssh_to_array (X2GoClientNetworkOptionsSSH * const self) {
   GPtrArray *ret = NULL;
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_OPTIONS_SSH (self), ret);
@@ -120,25 +120,25 @@ enum {
 static GParamSpec *net_ssh_obj_properties[X2GO_NET_SSH_N_PROPERTIES] = { NULL, };
 
 
-static void x2goclient_network_ssh_dispose (GObject *object);
-static void x2goclient_network_ssh_finalize (GObject *object);
-static void x2goclient_network_ssh_set_property (GObject *object, guint prop_id, const GValue * const value, GParamSpec *param_spec);
-static void x2goclient_network_ssh_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *param_spec);
+static void x2goclient_network_ssh_dispose (GObject * const object);
+static void x2goclient_network_ssh_finalize (GObject * const object);
+static void x2goclient_network_ssh_set_property (GObject * const object, const guint prop_id, const GValue * const value, GParamSpec * const param_spec);
+static void x2goclient_network_ssh_get_property (GObject * const object, guint prop_id, GValue * const value, GParamSpec * const param_spec);
 static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const GString * const sockspec);
-static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString * const portspec, GError **gerr);
+static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString * const portspec, GError ** const gerr);
 static GString* x2goclient_network_ssh_sanitize_sockspec (const GString * const sockspec);
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * const sockspec, const gboolean want_v6, GError **gerr);
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString * const sockspec, GError **gerr);
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork *parent, const GString * const sockspec);
-static gboolean x2goclient_network_ssh_kill_subprocesses (X2GoClientNetworkSSH *self);
-static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork *parent, GError **gerr);
-static gboolean x2goclient_network_ssh_fetch_openssh_version (X2GoClientNetworkSSH *self, GError **gerr);
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * const sockspec, const gboolean want_v6, GError ** const gerr);
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString * const sockspec, GError ** const gerr);
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork * const parent, const GString * const sockspec);
+static gboolean x2goclient_network_ssh_kill_subprocesses (X2GoClientNetworkSSH * const self);
+static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork * const parent, GError ** const gerr);
+static gboolean x2goclient_network_ssh_fetch_openssh_version (X2GoClientNetworkSSH * const self, GError ** const gerr);
 static void x2goclient_network_ssh_log_std_str (const gchar * const str, const gsize str_size, const _Bool select_stderr);
 static gboolean x2goclient_network_ssh_gptrarray_to_string (GPtrArray * const arr, const gchar * const prelude, gchar ** const ret_str);
 static void x2goclient_network_ssh_gptrarray_print_debug (GPtrArray * const arr, const gchar * const prelude, const gchar * const desc);
 
 
-static void x2goclient_network_ssh_class_init (X2GoClientNetworkSSHClass *klass) {
+static void x2goclient_network_ssh_class_init (X2GoClientNetworkSSHClass * const klass) {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->dispose = &x2goclient_network_ssh_dispose;
@@ -167,7 +167,7 @@ static void x2goclient_network_ssh_class_init (X2GoClientNetworkSSHClass *klass)
   parent_class->parse_sockspec = &x2goclient_network_ssh_parse_sockspec;
 }
 
-static void x2goclient_network_ssh_init (X2GoClientNetworkSSH *self) {
+static void x2goclient_network_ssh_init (X2GoClientNetworkSSH * const self) {
   /* Properties. */
   self->openssh_version = NULL;
   self->openssh_bugs = x2goclient_openssh_bugs_new ();
@@ -205,11 +205,11 @@ X2GoClientNetworkSSH* x2goclient_network_ssh_new (const char * const session_pat
   return (ret);
 }
 
-static void x2goclient_network_ssh_dispose (GObject *object) {
+static void x2goclient_network_ssh_dispose (GObject * const object) {
   (G_OBJECT_CLASS (x2goclient_network_ssh_parent_class))->dispose (object);
 }
 
-static void x2goclient_network_ssh_finalize (GObject *object) {
+static void x2goclient_network_ssh_finalize (GObject * const object) {
   X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (object);
 
   /* Properties. */
@@ -235,7 +235,7 @@ static void x2goclient_network_ssh_finalize (GObject *object) {
 }
 
 
-static void x2goclient_network_ssh_set_property (GObject *object, guint prop_id, const GValue * const value, GParamSpec *param_spec) {
+static void x2goclient_network_ssh_set_property (GObject * const object, const guint prop_id, const GValue * const value, GParamSpec * const param_spec) {
   X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (object);
 
   switch (prop_id) {
@@ -259,7 +259,7 @@ static void x2goclient_network_ssh_set_property (GObject *object, guint prop_id,
   }
 }
 
-static void x2goclient_network_ssh_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *param_spec) {
+static void x2goclient_network_ssh_get_property (GObject * const object, const guint prop_id, GValue * const value, GParamSpec * const param_spec) {
   X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (object);
 
   switch (prop_id) {
@@ -320,7 +320,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const
   return (ret);
 }
 
-static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString * const portspec, GError **gerr) {
+static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString * const portspec, GError ** const gerr) {
   guint16 ret = 0;
 
   g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret);
@@ -380,7 +380,7 @@ static GString* x2goclient_network_ssh_sanitize_sockspec (const GString * const
   return (ret);
 }
 
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * const sockspec, const gboolean want_v6, GError **gerr) {
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * const sockspec, const gboolean want_v6, GError ** const gerr) {
   GSocketAddress *ret = NULL;
 
   g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret);
@@ -547,7 +547,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString *
   return (ret);
 }
 
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString * const sockspec, GError **gerr) {
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString * const sockspec, GError ** const gerr) {
   GSocketAddress *ret = NULL;
 
   g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret);
@@ -630,7 +630,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GStrin
   return (ret);
 }
 
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork *parent, const GString * const sockspec) {
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork * const parent, const GString * const sockspec) {
   GSocketAddress *ret = NULL;
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK (parent), ret);
@@ -691,7 +691,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork
   return ret;
 }
 
-static gboolean x2goclient_network_ssh_kill_subprocesses (X2GoClientNetworkSSH *self) {
+static gboolean x2goclient_network_ssh_kill_subprocesses (X2GoClientNetworkSSH * const self) {
   gboolean ret = FALSE;
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (self), ret);
@@ -736,7 +736,7 @@ static gboolean x2goclient_network_ssh_kill_subprocesses (X2GoClientNetworkSSH *
   return (ret);
 }
 
-gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH *self, GError **gerr) {
+gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH * const self, GError ** const gerr) {
   gboolean ret = FALSE;
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (self), ret);
@@ -750,7 +750,7 @@ gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH *self, GError **ge
   return (ret);
 }
 
-static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork *parent, GError **gerr) {
+static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork * const parent, GError ** const gerr) {
   gboolean ret = TRUE;
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (parent), ret);
@@ -1025,7 +1025,7 @@ static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork *parent
   return (ret);
 }
 
-static gboolean x2goclient_network_ssh_fetch_openssh_version (X2GoClientNetworkSSH *self, GError **gerr) {
+static gboolean x2goclient_network_ssh_fetch_openssh_version (X2GoClientNetworkSSH * const self, GError ** const gerr) {
   gboolean ret = FALSE;
 
   g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (self), ret);
diff --git a/src/x2goclient-network-ssh.h b/src/x2goclient-network-ssh.h
index 80cc10f..5fa346d 100644
--- a/src/x2goclient-network-ssh.h
+++ b/src/x2goclient-network-ssh.h
@@ -38,7 +38,7 @@ G_DECLARE_FINAL_TYPE (X2GoClientNetworkOptionsSSH, x2goclient_network_options_ss
 X2GoClientNetworkOptionsSSH* x2goclient_network_options_ssh_new (void);
 
 
-GPtrArray* x2goclient_network_options_ssh_to_array (X2GoClientNetworkOptionsSSH *self);
+GPtrArray* x2goclient_network_options_ssh_to_array (X2GoClientNetworkOptionsSSH * const self);
 
 
 #define X2GOCLIENT_TYPE_NETWORK_SSH (x2goclient_network_ssh_get_type ())
@@ -70,7 +70,7 @@ enum {
 };
 
 
-gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH *self, GError **gerr);
+gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH * const self, GError ** const gerr);
 
 G_END_DECLS
 
diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c
index 36b27bc..c10a6b6 100644
--- a/src/x2goclient-network.c
+++ b/src/x2goclient-network.c
@@ -42,10 +42,10 @@ typedef struct X2GoClientNetworkOptionsPrivate_ {
 /* G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (X2GoClientNetworkOptions, x2goclient_network_options, G_TYPE_OBJECT); */
 G_DEFINE_ABSTRACT_TYPE (X2GoClientNetworkOptions, x2goclient_network_options, G_TYPE_OBJECT);
 
-static void x2goclient_network_options_class_init (X2GoClientNetworkOptionsClass *klass) {
+static void x2goclient_network_options_class_init (X2GoClientNetworkOptionsClass * const klass) {
 }
 
-static void x2goclient_network_options_init (X2GoClientNetworkOptions *self) {
+static void x2goclient_network_options_init (X2GoClientNetworkOptions * const self) {
 }
 
 
@@ -77,14 +77,14 @@ enum {
 static GParamSpec *net_obj_properties[X2GO_NET_N_PROPERTIES] = { NULL, };
 
 
-static void x2goclient_network_dispose (GObject *object);
-static void x2goclient_network_finalize (GObject *object);
-static void x2goclient_network_set_property (GObject *object, guint prop_id, const GValue * const value, GParamSpec *param_spec);
-static void x2goclient_network_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *param_spec);
-static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *self, const GString * const sockspec);
+static void x2goclient_network_dispose (GObject * const object);
+static void x2goclient_network_finalize (GObject * const object);
+static void x2goclient_network_set_property (GObject * const object, const guint prop_id, const GValue * const value, GParamSpec * const param_spec);
+static void x2goclient_network_get_property (GObject * const object, const guint prop_id, GValue * const value, GParamSpec * const param_spec);
+static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork * const self, const GString * const sockspec);
 
 
-static void x2goclient_network_class_init (X2GoClientNetworkClass *klass) {
+static void x2goclient_network_class_init (X2GoClientNetworkClass * const klass) {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->dispose = &x2goclient_network_dispose;
@@ -124,7 +124,7 @@ static void x2goclient_network_class_init (X2GoClientNetworkClass *klass) {
   g_object_class_install_properties (object_class, X2GO_NET_N_PROPERTIES, net_obj_properties);
 }
 
-static void x2goclient_network_init (X2GoClientNetwork *self) {
+static void x2goclient_network_init (X2GoClientNetwork * const self) {
   X2GoClientNetworkPrivate *priv = x2goclient_network_get_instance_private (self);
 
   priv->socket = NULL;
@@ -132,7 +132,7 @@ static void x2goclient_network_init (X2GoClientNetwork *self) {
   priv->session_path = NULL;
 }
 
-static void x2goclient_network_dispose (GObject *object) {
+static void x2goclient_network_dispose (GObject * const object) {
   X2GoClientNetworkPrivate *priv = x2goclient_network_get_instance_private (X2GOCLIENT_NETWORK (object));
 
   g_clear_object (&priv->socket);
@@ -141,7 +141,7 @@ static void x2goclient_network_dispose (GObject *object) {
   (G_OBJECT_CLASS (x2goclient_network_parent_class))->dispose (object);
 }
 
-static void x2goclient_network_finalize (GObject *object) {
+static void x2goclient_network_finalize (GObject * const object) {
   X2GoClientNetworkPrivate *priv = x2goclient_network_get_instance_private (X2GOCLIENT_NETWORK (object));
 
   if (priv->socket_spec) {
@@ -155,7 +155,7 @@ static void x2goclient_network_finalize (GObject *object) {
 }
 
 
-static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *self, const GString * const sockspec) {
+static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork * const self, const GString * const sockspec) {
   GSocketAddress *ret = NULL;
 
   X2GoClientNetworkClass *class = X2GOCLIENT_NETWORK_GET_CLASS (self);
@@ -168,7 +168,7 @@ static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *sel
   return (ret);
 }
 
-gboolean x2goclient_network_connect (X2GoClientNetwork *self, GError **gerr) {
+gboolean x2goclient_network_connect (X2GoClientNetwork * const self, GError ** const gerr) {
   gboolean ret = FALSE;
 
   X2GoClientNetworkClass *class = X2GOCLIENT_NETWORK_GET_CLASS (self);
@@ -182,7 +182,7 @@ gboolean x2goclient_network_connect (X2GoClientNetwork *self, GError **gerr) {
   return (ret);
 }
 
-static void x2goclient_network_set_property (GObject *object, guint prop_id, const GValue * const value, GParamSpec *param_spec) {
+static void x2goclient_network_set_property (GObject * const object, guint prop_id, const GValue * const value, GParamSpec * const param_spec) {
   X2GoClientNetwork *self = X2GOCLIENT_NETWORK (object);
   X2GoClientNetworkPrivate *priv = x2goclient_network_get_instance_private (self);
 
@@ -209,7 +209,7 @@ static void x2goclient_network_set_property (GObject *object, guint prop_id, con
   }
 }
 
-static void x2goclient_network_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *param_spec) {
+static void x2goclient_network_get_property (GObject * const object, const guint prop_id, GValue * const value, GParamSpec * const param_spec) {
   X2GoClientNetwork *self = X2GOCLIENT_NETWORK (object);
   X2GoClientNetworkPrivate *priv = x2goclient_network_get_instance_private (self);
 
diff --git a/src/x2goclient-network.h b/src/x2goclient-network.h
index c698dc6..cf96c35 100644
--- a/src/x2goclient-network.h
+++ b/src/x2goclient-network.h
@@ -55,16 +55,16 @@ G_DECLARE_DERIVABLE_TYPE (X2GoClientNetwork, x2goclient_network, X2GOCLIENT, NET
 struct _X2GoClientNetworkClass {
   GObjectClass parent_class;
 
-  gboolean (*connect) (X2GoClientNetwork *self, GError **gerr);
+  gboolean (*connect) (X2GoClientNetwork * const self, GError ** const gerr);
 
   /*< private >*/
-  GSocketAddress* (*parse_sockspec) (X2GoClientNetwork *self, const GString * const sockspec);
+  GSocketAddress* (*parse_sockspec) (X2GoClientNetwork * const self, const GString * const sockspec);
 
   /* We might need a lot more functions... */
   gpointer padding[50];
 };
 
-gboolean x2goclient_network_connect (X2GoClientNetwork *self, GError **gerr);
+gboolean x2goclient_network_connect (X2GoClientNetwork * const self, GError ** const gerr);
 
 G_END_DECLS
 
diff --git a/src/x2goclient-openssh-bugs.c b/src/x2goclient-openssh-bugs.c
index b2f540a..1c7fa45 100644
--- a/src/x2goclient-openssh-bugs.c
+++ b/src/x2goclient-openssh-bugs.c
@@ -35,7 +35,7 @@ X2GoClientOpenSSHBugs* x2goclient_openssh_bugs_new (void) {
   return (g_slice_new0 (X2GoClientOpenSSHBugs));
 }
 
-void x2goclient_openssh_bugs_free (X2GoClientOpenSSHBugs *openssh_bugs) {
+void x2goclient_openssh_bugs_free (X2GoClientOpenSSHBugs * const openssh_bugs) {
   g_slice_free (X2GoClientOpenSSHBugs, openssh_bugs);
 }
 
@@ -53,7 +53,7 @@ static X2GoClientOpenSSHBugs* x2goclient_openssh_bugs_copy (const X2GoClientOpen
 G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHBugs, x2goclient_openssh_bugs, &x2goclient_openssh_bugs_copy, &x2goclient_openssh_bugs_free)
 
 
-gboolean x2goclient_openssh_bugs_update (X2GoClientOpenSSHBugs *self, const X2GoClientOpenSSHVersion * const version, GError **gerr) {
+gboolean x2goclient_openssh_bugs_update (X2GoClientOpenSSHBugs * const self, const X2GoClientOpenSSHVersion * const version, GError ** const gerr) {
   gboolean ret = FALSE;
 
   g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret);
diff --git a/src/x2goclient-openssh-bugs.h b/src/x2goclient-openssh-bugs.h
index d3b25d1..440d5f6 100644
--- a/src/x2goclient-openssh-bugs.h
+++ b/src/x2goclient-openssh-bugs.h
@@ -59,10 +59,10 @@ typedef struct X2GoClientOpenSSHBugs_ {
 GType x2goclient_openssh_bugs_get_type (void) G_GNUC_CONST;
 
 X2GoClientOpenSSHBugs* x2goclient_openssh_bugs_new (void);
-void x2goclient_openssh_bugs_free (X2GoClientOpenSSHBugs *openssh_bugs);
+void x2goclient_openssh_bugs_free (X2GoClientOpenSSHBugs * const openssh_bugs);
 
 
-gboolean x2goclient_openssh_bugs_update (X2GoClientOpenSSHBugs *self, const X2GoClientOpenSSHVersion * const version, GError **gerr);
+gboolean x2goclient_openssh_bugs_update (X2GoClientOpenSSHBugs * const self, const X2GoClientOpenSSHVersion * const version, GError ** const gerr);
 
 
 /*
diff --git a/src/x2goclient-openssh-version.c b/src/x2goclient-openssh-version.c
index 2525bcd..3911989 100644
--- a/src/x2goclient-openssh-version.c
+++ b/src/x2goclient-openssh-version.c
@@ -39,7 +39,7 @@ X2GoClientOpenSSHVersion* x2goclient_openssh_version_new (void) {
   return (g_slice_new0 (X2GoClientOpenSSHVersion));
 }
 
-void x2goclient_openssh_version_free (X2GoClientOpenSSHVersion *openssh_version) {
+void x2goclient_openssh_version_free (X2GoClientOpenSSHVersion * const openssh_version) {
   g_slice_free (X2GoClientOpenSSHVersion, openssh_version);
 }
 
@@ -118,7 +118,7 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go
     }\
   } while (0)
 
-_Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_version, const gchar * const version_string, GError **gerr) {
+_Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion * const openssh_version, const gchar * const version_string, GError ** const gerr) {
   _Bool ret = FALSE;
 
   g_return_val_if_fail (((NULL == gerr) || (NULL == *gerr)), ret);
@@ -368,7 +368,7 @@ _Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_versio
   return (ret);
 }
 
-X2GoClientOpenSSHVersion* x2goclient_openssh_version_fetch_openssh_version (GError **gerr) {
+X2GoClientOpenSSHVersion* x2goclient_openssh_version_fetch_openssh_version (GError ** const gerr) {
   X2GoClientOpenSSHVersion *ret = NULL;
   gboolean cont = FALSE;
 
diff --git a/src/x2goclient-openssh-version.h b/src/x2goclient-openssh-version.h
index 42b1273..a22309d 100644
--- a/src/x2goclient-openssh-version.h
+++ b/src/x2goclient-openssh-version.h
@@ -45,7 +45,7 @@ typedef struct X2GoClientOpenSSHVersion_ {
 GType x2goclient_openssh_version_get_type (void) G_GNUC_CONST;
 
 X2GoClientOpenSSHVersion* x2goclient_openssh_version_new (void);
-void x2goclient_openssh_version_free (X2GoClientOpenSSHVersion *openssh_version);
+void x2goclient_openssh_version_free (X2GoClientOpenSSHVersion * const openssh_version);
 
 /*
  * Error handling helpers.
@@ -80,8 +80,8 @@ enum {
 };
 
 
-_Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_version, const gchar * const version_string, GError **gerr);
-X2GoClientOpenSSHVersion* x2goclient_openssh_version_fetch_openssh_version (GError **gerr);
+_Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion * const openssh_version, const gchar * const version_string, GError ** const gerr);
+X2GoClientOpenSSHVersion* x2goclient_openssh_version_fetch_openssh_version (GError ** const gerr);
 
 
 G_END_DECLS
diff --git a/src/x2goclient-utils.c b/src/x2goclient-utils.c
index 28eaf85..d1ac734 100644
--- a/src/x2goclient-utils.c
+++ b/src/x2goclient-utils.c
@@ -101,7 +101,7 @@ void x2goclient_clear_strings (gpointer data) {
  *
  * Returns: the converted value as a #long long, unless an error occurred
  */
-long long x2goclient_str_to_int (const gchar *restrict str, _Bool min, long long limit_min, _Bool max, long long limit_max, const gchar **restrict end, _Bool *restrict conv_err, _Bool *restrict min_err, _Bool *restrict max_err) {
+long long x2goclient_str_to_int (const gchar * const restrict str, const _Bool min, const long long limit_min, const _Bool max, const long long limit_max, const gchar ** const restrict end, _Bool * const restrict conv_err, _Bool * const restrict min_err, _Bool * const restrict max_err) {
   long long ret = 42;
 
   *min_err = *max_err = FALSE;
@@ -193,7 +193,7 @@ long long x2goclient_str_to_int (const gchar *restrict str, _Bool min, long long
  *          original string) if @needle was not found, unless an error
  *          occurred
  */
-gchar* x2goclient_strbrk_dup (gchar *restrict *haystack, const char needle, const _Bool free_orig, gsize * const new_size) {
+gchar* x2goclient_strbrk_dup (gchar *restrict * const haystack, const char needle, const _Bool free_orig, gsize * const new_size) {
   gchar *ret = NULL;
 
   g_return_val_if_fail (((NULL != haystack) && (NULL != *haystack)), ret);
diff --git a/src/x2goclient-utils.h b/src/x2goclient-utils.h
index 89e0425..a626cbf 100644
--- a/src/x2goclient-utils.h
+++ b/src/x2goclient-utils.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
 #endif /* !defined (__GI_SCANNER__) */
 #endif /* !defined (__GTK_DOC_IGNORE__) */
 
-void x2goclient_clear_strings (gpointer data);
+void x2goclient_clear_strings (gpointer const data);
 
-long long x2goclient_str_to_int (const gchar *restrict str, _Bool min, long long limit_min, _Bool max, long long limit_max, const gchar **restrict end, _Bool *restrict conv_err, _Bool *restrict min_err, _Bool *restrict max_err);
-gchar* x2goclient_strbrk_dup (gchar *restrict *haystack, const char needle, const _Bool free_orig, gsize * const new_size);
+long long x2goclient_str_to_int (const gchar * const restrict str, const _Bool min, const long long limit_min, const _Bool max, const long long limit_max, const gchar ** const restrict end, _Bool * const restrict conv_err, _Bool * const restrict min_err, _Bool * const restrict max_err);
+gchar* x2goclient_strbrk_dup (gchar * restrict * const haystack, const char needle, const _Bool free_orig, gsize * const new_size);
 
 G_END_DECLS
 

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

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[X2Go-Commits] [libx2goclient] 08/44: misc src/: constify all function parameters.