[X2Go-Commits] [libx2goclient] 13/19: src/x2goclient-{{network{, -ssh}, openssh-version}.{c, h}, openssh-bugs.c}: constify pointers in function parameters to deter people from reassigning them to other data within the function.
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 99cf97cb99a496f7e277c69ef909661cc3c19043
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu May 28 15:22:20 2020 +0200
src/x2goclient-{{network{,-ssh},openssh-version}.{c,h},openssh-bugs.c}: constify pointers in function parameters to deter people from reassigning them to other data within the function.
---
src/x2goclient-network-ssh.c | 30 +++++++++++++++---------------
src/x2goclient-network-ssh.h | 2 +-
src/x2goclient-network.c | 8 ++++----
src/x2goclient-network.h | 2 +-
src/x2goclient-openssh-bugs.c | 2 +-
src/x2goclient-openssh-version.c | 4 ++--
src/x2goclient-openssh-version.h | 2 +-
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c
index 288c35e..1fcf580 100644
--- a/src/x2goclient-network-ssh.c
+++ b/src/x2goclient-network-ssh.c
@@ -116,14 +116,14 @@ 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 *value, GParamSpec *param_spec);
+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 GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const GString *sockspec);
-static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString *portspec, GError **gerr);
-static GString* x2goclient_network_ssh_sanitize_sockspec (const GString *sockspec);
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString *sockspec, const gboolean want_v6, GError **gerr);
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString *sockspec, GError **gerr);
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork *parent, const GString *sockspec);
+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 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);
@@ -167,7 +167,7 @@ static void x2goclient_network_ssh_init (X2GoClientNetworkSSH *self) {
self->master_conn = NULL;
}
-X2GoClientNetworkSSH* x2goclient_network_ssh_new (const char *session_path) {
+X2GoClientNetworkSSH* x2goclient_network_ssh_new (const char * const session_path) {
X2GoClientNetworkSSH *ret = NULL;
GArray *prop_names = g_array_new (FALSE, TRUE, sizeof (gchar*));
@@ -221,7 +221,7 @@ static void x2goclient_network_ssh_finalize (GObject *object) {
}
-static void x2goclient_network_ssh_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *param_spec) {
+static void x2goclient_network_ssh_set_property (GObject *object, guint prop_id, const GValue * const value, GParamSpec *param_spec) {
X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (object);
switch (prop_id) {
@@ -257,7 +257,7 @@ static void x2goclient_network_ssh_get_property (GObject *object, guint prop_id,
}
}
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const GString *sockspec) {
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const GString * const sockspec) {
GSocketAddress *ret = NULL;
/*
@@ -300,7 +300,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const
return (ret);
}
-static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString *portspec, GError **gerr) {
+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);
@@ -346,7 +346,7 @@ static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString *portsp
return (ret);
}
-static GString* x2goclient_network_ssh_sanitize_sockspec (const GString *sockspec) {
+static GString* x2goclient_network_ssh_sanitize_sockspec (const GString * const sockspec) {
GString *ret = NULL;
gchar *sanitize_sockspec = g_strdup (sockspec->str);
@@ -358,7 +358,7 @@ 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 **gerr) {
+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);
@@ -525,7 +525,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString *
return (ret);
}
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString *sockspec, GError **gerr) {
+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);
@@ -608,7 +608,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GStrin
return (ret);
}
-static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork *parent, const GString *sockspec) {
+static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetwork *parent, const GString * const sockspec) {
GSocketAddress *ret = NULL;
if (sockspec) {
diff --git a/src/x2goclient-network-ssh.h b/src/x2goclient-network-ssh.h
index 3e5ce29..47441b0 100644
--- a/src/x2goclient-network-ssh.h
+++ b/src/x2goclient-network-ssh.h
@@ -44,7 +44,7 @@ GPtrArray* x2goclient_network_options_ssh_to_array (X2GoClientNetworkOptionsSSH
#define X2GOCLIENT_TYPE_NETWORK_SSH (x2goclient_network_ssh_get_type ())
G_DECLARE_FINAL_TYPE (X2GoClientNetworkSSH, x2goclient_network_ssh, X2GOCLIENT, NETWORK_SSH, X2GoClientNetwork)
-X2GoClientNetworkSSH* x2goclient_network_ssh_new (const gchar *session_path);
+X2GoClientNetworkSSH* x2goclient_network_ssh_new (const gchar * const session_path);
/*
diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c
index 843d714..d771c06 100644
--- a/src/x2goclient-network.c
+++ b/src/x2goclient-network.c
@@ -79,9 +79,9 @@ 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 *value, GParamSpec *param_spec);
+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 *sockspec);
+static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *self, const GString * const sockspec);
static void x2goclient_network_class_init (X2GoClientNetworkClass *klass) {
@@ -155,7 +155,7 @@ static void x2goclient_network_finalize (GObject *object) {
}
-static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *self, const GString *sockspec) {
+static GSocketAddress* x2goclient_network_parse_sockspec (X2GoClientNetwork *self, const GString * const sockspec) {
GSocketAddress *ret = NULL;
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 *value, GParamSpec *param_spec) {
+static void x2goclient_network_set_property (GObject *object, guint prop_id, const GValue * const value, GParamSpec *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 1812ba2..c698dc6 100644
--- a/src/x2goclient-network.h
+++ b/src/x2goclient-network.h
@@ -58,7 +58,7 @@ struct _X2GoClientNetworkClass {
gboolean (*connect) (X2GoClientNetwork *self, GError **gerr);
/*< private >*/
- GSocketAddress* (*parse_sockspec) (X2GoClientNetwork *self, const GString *sockspec);
+ GSocketAddress* (*parse_sockspec) (X2GoClientNetwork *self, const GString * const sockspec);
/* We might need a lot more functions... */
gpointer padding[50];
diff --git a/src/x2goclient-openssh-bugs.c b/src/x2goclient-openssh-bugs.c
index 68ccf83..51df126 100644
--- a/src/x2goclient-openssh-bugs.c
+++ b/src/x2goclient-openssh-bugs.c
@@ -38,7 +38,7 @@ void x2goclient_openssh_bugs_free (X2GoClientOpenSSHBugs *openssh_bugs) {
g_slice_free (X2GoClientOpenSSHBugs, openssh_bugs);
}
-static X2GoClientOpenSSHBugs* x2goclient_openssh_bugs_copy (X2GoClientOpenSSHBugs *src) {
+static X2GoClientOpenSSHBugs* x2goclient_openssh_bugs_copy (const X2GoClientOpenSSHBugs * const src) {
X2GoClientOpenSSHBugs *dst = NULL;
g_return_val_if_fail (src != NULL, dst);
diff --git a/src/x2goclient-openssh-version.c b/src/x2goclient-openssh-version.c
index 3391ed6..030860d 100644
--- a/src/x2goclient-openssh-version.c
+++ b/src/x2goclient-openssh-version.c
@@ -42,7 +42,7 @@ void x2goclient_openssh_version_free (X2GoClientOpenSSHVersion *openssh_version)
g_slice_free (X2GoClientOpenSSHVersion, openssh_version);
}
-static X2GoClientOpenSSHVersion* x2goclient_openssh_version_copy (X2GoClientOpenSSHVersion *src) {
+static X2GoClientOpenSSHVersion* x2goclient_openssh_version_copy (const X2GoClientOpenSSHVersion * const src) {
X2GoClientOpenSSHVersion *dst = NULL;
g_return_val_if_fail (src != NULL, dst);
@@ -117,7 +117,7 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go
}\
} while (0)
-_Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_version, const gchar *version_string, GError **gerr) {
+_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);
diff --git a/src/x2goclient-openssh-version.h b/src/x2goclient-openssh-version.h
index 9c434d3..0df8ada 100644
--- a/src/x2goclient-openssh-version.h
+++ b/src/x2goclient-openssh-version.h
@@ -78,7 +78,7 @@ enum {
};
-_Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_version, const gchar *version_string, GError **gerr);
+_Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_version, const gchar * const version_string, GError **gerr);
G_END_DECLS
--
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