This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit aba666e25179041c1c6ab559b06580b87ab7c9d8 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Dec 3 13:16:32 2021 +0100 src/x2goclient-{{network-ssh,openssh-version,utils}.c,utils.h}: change occurrences of "long long" to "long long int". --- src/x2goclient-network-ssh.c | 6 +++--- src/x2goclient-openssh-version.c | 6 +++--- src/x2goclient-utils.c | 4 ++-- src/x2goclient-utils.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 0484135..6144bda 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -491,14 +491,14 @@ static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString * const _Bool conv_err = TRUE, min_err = TRUE, max_err = TRUE; - long long conv = x2goclient_str_to_int (portspec->str + 1, TRUE, 1, TRUE, ((1 << 16) - 1), NULL, &conv_err, &min_err, &max_err); + long long int conv = x2goclient_str_to_int (portspec->str + 1, TRUE, 1, TRUE, ((1 << 16) - 1), NULL, &conv_err, &min_err, &max_err); if (conv_err) { if (min_err) { - g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_PORT_CONV_UNDERFLOW, "Port specifier too small to fit into long long type."); + g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_PORT_CONV_UNDERFLOW, "Port specifier too small to fit into long long int type."); } else if (max_err) { - g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_PORT_CONV_OVERFLOW, "Port specifier too big to fit into long long type."); + g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_PORT_CONV_OVERFLOW, "Port specifier too big to fit into long long int type."); } else { g_set_error_literal (gerr, X2GOCLIENT_NETWORK_SSH_ERROR, X2GOCLIENT_NETWORK_SSH_ERROR_PORT_CONV_NOT_NUMERIC, "Port specifier is not numeric."); diff --git a/src/x2goclient-openssh-version.c b/src/x2goclient-openssh-version.c index 0bf343b..83f17f0 100644 --- a/src/x2goclient-openssh-version.c +++ b/src/x2goclient-openssh-version.c @@ -532,16 +532,16 @@ _Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion * const openssh const gchar *end = NULL; const gchar *err_msg = NULL; gint err_code = -1; - long long conv = x2goclient_str_to_int (tmp_copy, TRUE, 0, TRUE, G_MAXUINT32, &end, &conv_err, &min_err, &max_err); + long long int conv = x2goclient_str_to_int (tmp_copy, TRUE, 0, TRUE, G_MAXUINT32, &end, &conv_err, &min_err, &max_err); if (conv_err) { if (min_err) { GENERATE_ERROR_CODE (err_code, num_i, UNDERFLOW); - GENERATE_ERROR_MSG (err_msg, num_i, "version number is too small to fit into long long type."); + GENERATE_ERROR_MSG (err_msg, num_i, "version number is too small to fit into long long int type."); } else if (max_err) { GENERATE_ERROR_CODE (err_code, num_i, OVERFLOW); - GENERATE_ERROR_MSG (err_msg, num_i, "version number is too big to fit into long long type."); + GENERATE_ERROR_MSG (err_msg, num_i, "version number is too big to fit into long long int type."); } else { GENERATE_ERROR_CODE (err_code, num_i, NOT_NUMERIC); diff --git a/src/x2goclient-utils.c b/src/x2goclient-utils.c index 5f61dad..ac1a16c 100644 --- a/src/x2goclient-utils.c +++ b/src/x2goclient-utils.c @@ -130,8 +130,8 @@ void x2goclient_clear_strings (gpointer data) { * * Since: 0.0.0 */ -long long x2goclient_str_to_int (const gchar * const restrict str, const _Bool min, const long long int limit_min, const _Bool max, const long long int 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; +long long int x2goclient_str_to_int (const gchar * const restrict str, const _Bool min, const long long int limit_min, const _Bool max, const long long int limit_max, const gchar ** const restrict end, _Bool * const restrict conv_err, _Bool * const restrict min_err, _Bool * const restrict max_err) { + long long int ret = 42; *min_err = *max_err = FALSE; diff --git a/src/x2goclient-utils.h b/src/x2goclient-utils.h index 54132b2..be9bd5d 100644 --- a/src/x2goclient-utils.h +++ b/src/x2goclient-utils.h @@ -135,7 +135,7 @@ G_BEGIN_DECLS void x2goclient_clear_strings (gpointer const data); -long long x2goclient_str_to_int (const gchar * const restrict str, const _Bool min, const long long int limit_min, const _Bool max, const long long int limit_max, const gchar ** const restrict end, _Bool * const restrict conv_err, _Bool * const restrict min_err, _Bool * const restrict max_err); +long long int x2goclient_str_to_int (const gchar * const restrict str, const _Bool min, const long long int limit_min, const _Bool max, const long long int 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); const gchar* x2goclient_bool_to_str (const gboolean in); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git