diff options
Diffstat (limited to 'libnm-core')
27 files changed, 130 insertions, 130 deletions
diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c index 56e91e26fc..a71a491862 100644 --- a/libnm-core/crypto_nss.c +++ b/libnm-core/crypto_nss.c @@ -399,7 +399,7 @@ crypto_verify_pkcs12 (const guint8 *data, PK11SlotInfo *slot = NULL; SECStatus s; gunichar2 *ucs2_password; - glong ucs2_chars = 0; + long ucs2_chars = 0; #ifndef WORDS_BIGENDIAN guint16 *p; #endif /* WORDS_BIGENDIAN */ diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 8413bf99fa..8806e2ba53 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -320,11 +320,11 @@ GVariant *_nm_dbus_proxy_call_finish (GDBusProxy *proxy, GError **error); GVariant *_nm_dbus_proxy_call_sync (GDBusProxy *proxy, - const gchar *method_name, + const char *method_name, GVariant *parameters, const GVariantType *reply_type, GDBusCallFlags flags, - gint timeout_msec, + int timeout_msec, GCancellable *cancellable, GError **error); diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index 8389bf361e..25af7c9964 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -117,7 +117,7 @@ dbus_signal_meta_marshal (GClosure *closure, * * The argument types in @c_handler correspond to the types output by * g_dbus_gvariant_to_gvalue(), except for 'ay' and 'aay'. In particular: - * - both 16-bit and 32-bit integers are passed as #gint/#guint + * - both 16-bit and 32-bit integers are passed as #int/#guint * - 'as' values are passed as #GStrv (char **) * - all other array, tuple, and dict types are passed as #GVariant * @@ -245,11 +245,11 @@ _nm_dbus_proxy_call_finish (GDBusProxy *proxy, */ GVariant * _nm_dbus_proxy_call_sync (GDBusProxy *proxy, - const gchar *method_name, + const char *method_name, GVariant *parameters, const GVariantType *reply_type, GDBusCallFlags flags, - gint timeout_msec, + int timeout_msec, GCancellable *cancellable, GError **error) { diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c index 5000b58318..21f8b07d70 100644 --- a/libnm-core/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile-utils.c @@ -109,8 +109,8 @@ nm_keyfile_plugin_kf_set_##stype##_list (GKeyFile *kf, \ g_key_file_set_##stype##_list (kf, alias ?: group, key, list, length); \ } -DEFINE_KF_LIST_WRAPPER(integer, gint*, gint); -DEFINE_KF_LIST_WRAPPER(string, gchar **, const gchar* const); +DEFINE_KF_LIST_WRAPPER(integer, int*, int); +DEFINE_KF_LIST_WRAPPER(string, char **, const char* const); void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf, @@ -173,19 +173,19 @@ nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \ g_key_file_set_##stype (kf, alias ?: group, key, value); \ } -DEFINE_KF_WRAPPER(string, gchar*, const gchar*); -DEFINE_KF_WRAPPER(integer, gint, gint); +DEFINE_KF_WRAPPER(string, char*, const char*); +DEFINE_KF_WRAPPER(integer, int, int); DEFINE_KF_WRAPPER(uint64, guint64, guint64); DEFINE_KF_WRAPPER(boolean, gboolean, gboolean); -DEFINE_KF_WRAPPER(value, gchar*, const gchar*); +DEFINE_KF_WRAPPER(value, char*, const char*); -gchar ** +char ** nm_keyfile_plugin_kf_get_keys (GKeyFile *kf, const char *group, gsize *out_length, GError **error) { - gchar **keys; + char **keys; const char *alias; GError *local = NULL; diff --git a/libnm-core/nm-keyfile-utils.h b/libnm-core/nm-keyfile-utils.h index 832ad0b4aa..46a6d56432 100644 --- a/libnm-core/nm-keyfile-utils.h +++ b/libnm-core/nm-keyfile-utils.h @@ -46,8 +46,8 @@ void nm_keyfile_plugin_kf_set_##stype##_list (GKeyFile *kf, \ const char *key, \ set_ctype list[], \ gsize length); -DEFINE_KF_LIST_WRAPPER_PROTO(integer, gint*, gint) -DEFINE_KF_LIST_WRAPPER_PROTO(string, gchar**, const gchar* const) +DEFINE_KF_LIST_WRAPPER_PROTO(integer, int*, int) +DEFINE_KF_LIST_WRAPPER_PROTO(string, char**, const char* const) void nm_keyfile_plugin_kf_set_integer_list_uint8 (GKeyFile *kf, const char *group, @@ -66,14 +66,14 @@ void nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \ const char *group, \ const char *key, \ set_ctype value); -DEFINE_KF_WRAPPER_PROTO(string, gchar*, const gchar*) -DEFINE_KF_WRAPPER_PROTO(integer, gint, gint) +DEFINE_KF_WRAPPER_PROTO(string, char*, const char*) +DEFINE_KF_WRAPPER_PROTO(integer, int, int) DEFINE_KF_WRAPPER_PROTO(uint64, guint64, guint64) DEFINE_KF_WRAPPER_PROTO(boolean, gboolean, gboolean) -DEFINE_KF_WRAPPER_PROTO(value, gchar*, const gchar*) +DEFINE_KF_WRAPPER_PROTO(value, char*, const char*) /* Misc */ -gchar ** nm_keyfile_plugin_kf_get_keys (GKeyFile *kf, +char ** nm_keyfile_plugin_kf_get_keys (GKeyFile *kf, const char *group, gsize *out_length, GError **error); diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c index 3ea1a53e67..17741f5f14 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -731,7 +731,7 @@ ip6_addr_gen_mode_parser (KeyfileReaderInfo *info, NMSetting *setting, const cha } else addr_gen_mode = NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64; - g_object_set (G_OBJECT (setting), key, (gint) addr_gen_mode, NULL); + g_object_set (G_OBJECT (setting), key, (int) addr_gen_mode, NULL); } static void @@ -1393,7 +1393,7 @@ qdisc_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key) { const char *setting_name = nm_setting_get_name (setting); GPtrArray *qdiscs; - gs_strfreev gchar **keys = NULL; + gs_strfreev char **keys = NULL; gsize n_keys = 0; int i; @@ -1441,7 +1441,7 @@ tfilter_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key) { const char *setting_name = nm_setting_get_name (setting); GPtrArray *tfilters; - gs_strfreev gchar **keys = NULL; + gs_strfreev char **keys = NULL; gsize n_keys = 0; int i; @@ -1525,7 +1525,7 @@ write_array_of_uint (GKeyFile *file, g_return_if_fail (g_array_get_element_size (array) == sizeof (guint)); - tmp_array = g_new (gint, array->len); + tmp_array = g_new (int, array->len); for (i = 0; i < array->len; i++) { guint v = g_array_index (array, guint, i); @@ -2522,7 +2522,7 @@ read_one_setting_value (NMSetting *setting, } else g_object_set (setting, key, int_val, NULL); } else if (type == G_TYPE_BYTES) { - gint *tmp; + int *tmp; GByteArray *array; GBytes *bytes; gsize length; @@ -2555,7 +2555,7 @@ read_one_setting_value (NMSetting *setting, g_bytes_unref (bytes); g_free (tmp); } else if (type == G_TYPE_STRV) { - gchar **sa; + char **sa; gsize length; sa = nm_keyfile_plugin_kf_get_string_list (keyfile, setting_name, key, &length, NULL); @@ -2581,11 +2581,11 @@ read_one_setting_value (NMSetting *setting, } } } else if (G_VALUE_HOLDS_ENUM (value)) { - gint int_val; + int int_val; int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, &err); if (!err) - g_object_set (setting, key, (gint) int_val, NULL); + g_object_set (setting, key, (int) int_val, NULL); } else { if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN, _("unhandled setting property type '%s'"), @@ -2675,7 +2675,7 @@ nm_keyfile_read (GKeyFile *keyfile, gs_unref_object NMConnection *connection = NULL; NMSettingConnection *s_con; NMSetting *setting; - gchar **groups; + char **groups; gsize length; int i; gboolean vpn_secrets = FALSE; @@ -2880,7 +2880,7 @@ write_setting_value (NMSetting *setting, char **array; array = (char **) g_value_get_boxed (value); - nm_keyfile_plugin_kf_set_string_list (info->keyfile, setting_name, key, (const gchar **const) array, g_strv_length (array)); + nm_keyfile_plugin_kf_set_string_list (info->keyfile, setting_name, key, (const char **const) array, g_strv_length (array)); } else if (type == G_TYPE_HASH_TABLE) { write_hash_of_string (info->keyfile, setting, key, value); } else if (type == G_TYPE_ARRAY) { @@ -2889,7 +2889,7 @@ write_setting_value (NMSetting *setting, /* Flags are guint but GKeyFile has no uint reader, just uint64 */ nm_keyfile_plugin_kf_set_uint64 (info->keyfile, setting_name, key, (guint64) g_value_get_flags (value)); } else if (G_VALUE_HOLDS_ENUM (value)) - nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (gint) g_value_get_enum (value)); + nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (int) g_value_get_enum (value)); else g_warn_if_reached (); } diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c index 64ed663c22..2a3ee39732 100644 --- a/libnm-core/nm-property-compare.c +++ b/libnm-core/nm-property-compare.c @@ -27,7 +27,7 @@ #include "nm-property-compare.h" -static gint +static int _nm_property_compare_collection (GVariant *value1, GVariant *value2) { GVariant *child1, *child2; @@ -55,7 +55,7 @@ _nm_property_compare_collection (GVariant *value1, GVariant *value2) return 0; } -static gint +static int _nm_property_compare_vardict (GVariant *value1, GVariant *value2) { GVariantIter iter; @@ -87,7 +87,7 @@ _nm_property_compare_vardict (GVariant *value1, GVariant *value2) return 0; } -static gint +static int _nm_property_compare_strdict (GVariant *value1, GVariant *value2) { GVariantIter iter; @@ -119,7 +119,7 @@ nm_property_compare (GVariant *value1, GVariant *value2) { const GVariantType *type1; const GVariantType *type2; - gint ret; + int ret; if (value1 == value2) return 0; diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index bf9c418096..c21197ee25 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -114,7 +114,7 @@ typedef struct { char *phase2_private_key_password; NMSettingSecretFlags phase2_private_key_password_flags; gboolean system_ca_certs; - gint auth_timeout; + int auth_timeout; } NMSetting8021xPrivate; enum { @@ -2724,7 +2724,7 @@ nm_setting_802_1x_get_phase2_private_key_format (NMSetting8021x *setting) * * Since: 1.8 **/ -gint +int nm_setting_802_1x_get_auth_timeout (NMSetting8021x *setting) { g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), 0); diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h index 986d048805..82ef5ebae1 100644 --- a/libnm-core/nm-setting-8021x.h +++ b/libnm-core/nm-setting-8021x.h @@ -359,7 +359,7 @@ NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format (NMSett NM_AVAILABLE_IN_1_8 NMSetting8021xAuthFlags nm_setting_802_1x_get_phase1_auth_flags (NMSetting8021x *setting); NM_AVAILABLE_IN_1_8 -gint nm_setting_802_1x_get_auth_timeout (NMSetting8021x *setting); +int nm_setting_802_1x_get_auth_timeout (NMSetting8021x *setting); G_END_DECLS diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index f450921f99..a35e48529a 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -179,7 +179,7 @@ nm_setting_bond_get_option (NMSettingBond *setting, static gboolean validate_int (const char *name, const char *value, const BondDefault *def) { - glong num; + long num; guint i; for (i = 0; i < strlen (value); i++) { diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index ac354fb944..88aa28dd6e 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -70,8 +70,8 @@ typedef struct { NMSettingConnectionAutoconnectSlaves autoconnect_slaves; GSList *permissions; /* list of Permission structs */ gboolean autoconnect; - gint autoconnect_priority; - gint autoconnect_retries; + int autoconnect_priority; + int autoconnect_retries; guint64 timestamp; gboolean read_only; char *zone; @@ -79,7 +79,7 @@ typedef struct { guint gateway_ping_timeout; NMMetered metered; NMSettingConnectionLldp lldp; - gint auth_retries; + int auth_retries; int mdns; } NMSettingConnectionPrivate; @@ -527,7 +527,7 @@ nm_setting_connection_get_autoconnect (NMSettingConnection *setting) * * Returns: the connection's autoconnect priority **/ -gint +int nm_setting_connection_get_autoconnect_priority (NMSettingConnection *setting) { g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), 0); @@ -546,7 +546,7 @@ nm_setting_connection_get_autoconnect_priority (NMSettingConnection *setting) * * Since: 1.6 **/ -gint +int nm_setting_connection_get_autoconnect_retries (NMSettingConnection *setting) { g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), -1); @@ -565,7 +565,7 @@ nm_setting_connection_get_autoconnect_retries (NMSettingConnection *setting) * * Since: 1.10 **/ -gint +int nm_setting_connection_get_auth_retries (NMSettingConnection *setting) { g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), -1); diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h index cf083a48e1..c3ec1a6dab 100644 --- a/libnm-core/nm-setting-connection.h +++ b/libnm-core/nm-setting-connection.h @@ -142,9 +142,9 @@ const char *nm_setting_connection_get_stable_id (NMSettingConnection *set const char *nm_setting_connection_get_interface_name (NMSettingConnection *setting); const char *nm_setting_connection_get_connection_type (NMSettingConnection *setting); gboolean nm_setting_connection_get_autoconnect (NMSettingConnection *setting); -gint nm_setting_connection_get_autoconnect_priority (NMSettingConnection *setting); +int nm_setting_connection_get_autoconnect_priority (NMSettingConnection *setting); NM_AVAILABLE_IN_1_6 -gint nm_setting_connection_get_autoconnect_retries (NMSettingConnection *setting); +int nm_setting_connection_get_autoconnect_retries (NMSettingConnection *setting); guint64 nm_setting_connection_get_timestamp (NMSettingConnection *setting); gboolean nm_setting_connection_get_read_only (NMSettingConnection *setting); @@ -187,7 +187,7 @@ NM_AVAILABLE_IN_1_2 NMSettingConnectionLldp nm_setting_connection_get_lldp (NMSettingConnection *setting); NM_AVAILABLE_IN_1_10 -gint nm_setting_connection_get_auth_retries (NMSettingConnection *setting); +int nm_setting_connection_get_auth_retries (NMSettingConnection *setting); NM_AVAILABLE_IN_1_12 NMSettingConnectionMdns nm_setting_connection_get_mdns (NMSettingConnection *setting); diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index 55e11d6220..6471519607 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -47,14 +47,14 @@ G_DEFINE_TYPE_WITH_CODE (NMSettingDcb, nm_setting_dcb, NM_TYPE_SETTING, typedef struct { NMSettingDcbFlags app_fcoe_flags; - gint app_fcoe_priority; + int app_fcoe_priority; char * app_fcoe_mode; NMSettingDcbFlags app_iscsi_flags; - gint app_iscsi_priority; + int app_iscsi_priority; NMSettingDcbFlags app_fip_flags; - gint app_fip_priority; + int app_fip_priority; /* Priority Flow Control */ NMSettingDcbFlags pfc_flags; @@ -127,7 +127,7 @@ nm_setting_dcb_get_app_fcoe_flags (NMSettingDcb *setting) * * Returns: the #NMSettingDcb:app-fcoe-priority property of the setting **/ -gint +int nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting) { g_return_val_if_fail (NM_IS_SETTING_DCB (setting), 0); @@ -169,7 +169,7 @@ nm_setting_dcb_get_app_iscsi_flags (NMSettingDcb *setting) * * Returns: the #NMSettingDcb:app-iscsi-priority property of the setting **/ -gint +int nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting) { g_return_val_if_fail (NM_IS_SETTING_DCB (setting), 0); @@ -197,7 +197,7 @@ nm_setting_dcb_get_app_fip_flags (NMSettingDcb *setting) * * Returns: the #NMSettingDcb:app-fip-priority property of the setting **/ -gint +int nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting) { g_return_val_if_fail (NM_IS_SETTING_DCB (setting), 0); @@ -593,7 +593,7 @@ check_uint_array (const guint *array, } static gboolean -check_priority (gint val, +check_priority (int val, NMSettingDcbFlags flags, const char *prop_name, GError **error) diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h index 51a883fb89..92ca268205 100644 --- a/libnm-core/nm-setting-dcb.h +++ b/libnm-core/nm-setting-dcb.h @@ -112,14 +112,14 @@ GType nm_setting_dcb_get_type (void); NMSetting * nm_setting_dcb_new (void); NMSettingDcbFlags nm_setting_dcb_get_app_fcoe_flags (NMSettingDcb *setting); -gint nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting); +int nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting); const char * nm_setting_dcb_get_app_fcoe_mode (NMSettingDcb *setting); NMSettingDcbFlags nm_setting_dcb_get_app_iscsi_flags (NMSettingDcb *setting); -gint nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting); +int nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting); NMSettingDcbFlags nm_setting_dcb_get_app_fip_flags (NMSettingDcb *setting); -gint nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting); +int nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting); /* Priority Flow Control */ NMSettingDcbFlags nm_setting_dcb_get_priority_flow_control_flags (NMSettingDcb *setting); diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index c7f8c55557..8e2df0c321 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -1391,7 +1391,7 @@ typedef struct { GPtrArray *dns; /* array of IP address strings */ GPtrArray *dns_search; /* array of domain name strings */ GPtrArray *dns_options;/* array of DNS options */ - gint dns_priority; + int dns_priority; GPtrArray *addresses; /* array of NMIPAddress */ GPtrArray *routes; /* array of NMIPRoute */ gint64 route_metric; @@ -1403,8 +1403,8 @@ typedef struct { gboolean dhcp_send_hostname; gboolean never_default; gboolean may_fail; - gint dad_timeout; - gint dhcp_timeout; + int dad_timeout; + int dhcp_timeout; } NMSettingIPConfigPrivate; enum { @@ -1804,7 +1804,7 @@ nm_setting_ip_config_get_dns_option (NMSettingIPConfig *setting, guint idx) * * Since: 1.2 **/ -gint +int nm_setting_ip_config_next_valid_dns_option (NMSettingIPConfig *setting, guint idx) { NMSettingIPConfigPrivate *priv; @@ -1966,7 +1966,7 @@ nm_setting_ip_config_clear_dns_options (NMSettingIPConfig *setting, gboolean is_ * * Since: 1.4 **/ -gint +int nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting) { g_return_val_if_fail (NM_IS_SETTING_IP_CONFIG (setting), 0); @@ -2421,7 +2421,7 @@ nm_setting_ip_config_get_may_fail (NMSettingIPConfig *setting) * * Since: 1.2 **/ -gint +int nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting) { g_return_val_if_fail (NM_IS_SETTING_IP_CONFIG (setting), 0); @@ -2441,7 +2441,7 @@ nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting) * * Since: 1.2 **/ -gint +int nm_setting_ip_config_get_dhcp_timeout (NMSettingIPConfig *setting) { g_return_val_if_fail (NM_IS_SETTING_IP_CONFIG (setting), 0); diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index 8b3c85de19..882a88b685 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -247,7 +247,7 @@ guint nm_setting_ip_config_get_num_dns_options (NMSettingIPConfig gboolean nm_setting_ip_config_has_dns_options (NMSettingIPConfig *setting); const char *nm_setting_ip_config_get_dns_option (NMSettingIPConfig *setting, guint idx); -gint nm_setting_ip_config_next_valid_dns_option (NMSettingIPConfig *setting, +int nm_setting_ip_config_next_valid_dns_option (NMSettingIPConfig *setting, guint idx); gboolean nm_setting_ip_config_add_dns_option (NMSettingIPConfig *setting, const char *dns_option); @@ -258,7 +258,7 @@ gboolean nm_setting_ip_config_remove_dns_option_by_value (NMSettingIPConfig void nm_setting_ip_config_clear_dns_options (NMSettingIPConfig *setting, gboolean is_set); NM_AVAILABLE_IN_1_4 -gint nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting); +int nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting); guint nm_setting_ip_config_get_num_addresses (NMSettingIPConfig *setting); NMIPAddress *nm_setting_ip_config_get_address (NMSettingIPConfig *setting, @@ -298,9 +298,9 @@ gboolean nm_setting_ip_config_get_dhcp_send_hostname (NMSettingIPConfig gboolean nm_setting_ip_config_get_never_default (NMSettingIPConfig *setting); gboolean nm_setting_ip_config_get_may_fail (NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_2 -gint nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting); +int nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_2 -gint nm_setting_ip_config_get_dhcp_timeout (NMSettingIPConfig *setting); +int nm_setting_ip_config_get_dhcp_timeout (NMSettingIPConfig *setting); G_END_DECLS diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index 49bf963dda..043836a0f0 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -42,7 +42,7 @@ void _nm_register_setting_impl (const char *name, NMSettingPriority _nm_setting_get_base_type_priority (NMSetting *setting); NMSettingPriority _nm_setting_type_get_base_type_priority (GType type); -gint _nm_setting_compare_priority (gconstpointer a, gconstpointer b); +int _nm_setting_compare_priority (gconstpointer a, gconstpointer b); typedef enum NMSettingUpdateSecretResult { NM_SETTING_UPDATE_SECRET_ERROR = FALSE, diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c index 76f0eec1a7..e0e5dacaa7 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/libnm-core/nm-setting-team-port.c @@ -114,7 +114,7 @@ nm_setting_team_port_get_config (NMSettingTeamPort *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_port_get_queue_id (NMSettingTeamPort *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), -1); @@ -130,7 +130,7 @@ nm_setting_team_port_get_queue_id (NMSettingTeamPort *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_port_get_prio (NMSettingTeamPort *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), 0); @@ -162,7 +162,7 @@ nm_setting_team_port_get_sticky (NMSettingTeamPort *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_port_get_lacp_prio (NMSettingTeamPort *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), 0); @@ -178,7 +178,7 @@ nm_setting_team_port_get_lacp_prio (NMSettingTeamPort *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_port_get_lacp_key (NMSettingTeamPort *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), 0); diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h index 4ecb183847..57611750b3 100644 --- a/libnm-core/nm-setting-team-port.h +++ b/libnm-core/nm-setting-team-port.h @@ -72,15 +72,15 @@ NMSetting * nm_setting_team_port_new (void); const char * nm_setting_team_port_get_config (NMSettingTeamPort *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_port_get_queue_id (NMSettingTeamPort *setting); +int nm_setting_team_port_get_queue_id (NMSettingTeamPort *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_port_get_prio (NMSettingTeamPort *setting); +int nm_setting_team_port_get_prio (NMSettingTeamPort *setting); NM_AVAILABLE_IN_1_12 gboolean nm_setting_team_port_get_sticky (NMSettingTeamPort *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_port_get_lacp_prio (NMSettingTeamPort *setting); +int nm_setting_team_port_get_lacp_prio (NMSettingTeamPort *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_port_get_lacp_key (NMSettingTeamPort *setting); +int nm_setting_team_port_get_lacp_key (NMSettingTeamPort *setting); NM_AVAILABLE_IN_1_12 guint nm_setting_team_port_get_num_link_watchers (NMSettingTeamPort *setting); NM_AVAILABLE_IN_1_12 diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index 138ad85a6d..b413adaec2 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -118,8 +118,8 @@ struct NMTeamLinkWatcher { * Since: 1.12 **/ NMTeamLinkWatcher * -nm_team_link_watcher_new_ethtool (gint delay_up, - gint delay_down, +nm_team_link_watcher_new_ethtool (int delay_up, + int delay_down, GError **error) { NMTeamLinkWatcher *watcher; @@ -161,9 +161,9 @@ nm_team_link_watcher_new_ethtool (gint delay_up, * Since: 1.12 **/ NMTeamLinkWatcher * -nm_team_link_watcher_new_nsna_ping (gint init_wait, - gint interval, - gint missed_max, +nm_team_link_watcher_new_nsna_ping (int init_wait, + int interval, + int missed_max, const char *target_host, GError **error) { @@ -225,9 +225,9 @@ nm_team_link_watcher_new_nsna_ping (gint init_wait, * Since: 1.12 **/ NMTeamLinkWatcher * -nm_team_link_watcher_new_arp_ping (gint init_wait, - gint interval, - gint missed_max, +nm_team_link_watcher_new_arp_ping (int init_wait, + int interval, + int missed_max, const char *target_host, const char *source_host, NMTeamLinkWatcherArpPingFlags flags, @@ -564,19 +564,19 @@ G_DEFINE_TYPE_WITH_CODE (NMSettingTeam, nm_setting_team, NM_TYPE_SETTING, typedef struct { char *config; - gint notify_peers_count; - gint notify_peers_interval; - gint mcast_rejoin_count; - gint mcast_rejoin_interval; + int notify_peers_count; + int notify_peers_interval; + int mcast_rejoin_count; + int mcast_rejoin_interval; char *runner; char *runner_hwaddr_policy; GPtrArray *runner_tx_hash; char *runner_tx_balancer; - gint runner_tx_balancer_interval; + int runner_tx_balancer_interval; gboolean runner_active; gboolean runner_fast_rate; - gint runner_sys_prio; - gint runner_min_ports; + int runner_sys_prio; + int runner_min_ports; char *runner_agg_select_policy; GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */ } NMSettingTeamPrivate; @@ -660,7 +660,7 @@ nm_setting_team_get_config (NMSettingTeam *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_get_notify_peers_count (NMSettingTeam *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), 0); @@ -676,7 +676,7 @@ nm_setting_team_get_notify_peers_count (NMSettingTeam *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_get_notify_peers_interval (NMSettingTeam *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), 0); @@ -692,7 +692,7 @@ nm_setting_team_get_notify_peers_interval (NMSettingTeam *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_get_mcast_rejoin_count (NMSettingTeam *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), 0); @@ -708,7 +708,7 @@ nm_setting_team_get_mcast_rejoin_count (NMSettingTeam *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_get_mcast_rejoin_interval (NMSettingTeam *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), 0); @@ -772,7 +772,7 @@ nm_setting_team_get_runner_tx_balancer (NMSettingTeam *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_get_runner_tx_balancer_interval (NMSettingTeam *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), 0); @@ -820,7 +820,7 @@ nm_setting_team_get_runner_fast_rate (NMSettingTeam *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_get_runner_sys_prio (NMSettingTeam *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), 0); @@ -836,7 +836,7 @@ nm_setting_team_get_runner_sys_prio (NMSettingTeam *setting) * * Since: 1.12 **/ -gint +int nm_setting_team_get_runner_min_ports (NMSettingTeam *setting) { g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), 0); diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index cd766d8e6d..a600053a67 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -57,19 +57,19 @@ typedef struct NMTeamLinkWatcher NMTeamLinkWatcher; GType nm_team_link_watcher_get_type (void); NM_AVAILABLE_IN_1_12 -NMTeamLinkWatcher *nm_team_link_watcher_new_ethtool (gint delay_up, - gint delay_down, +NMTeamLinkWatcher *nm_team_link_watcher_new_ethtool (int delay_up, + int delay_down, GError **error); NM_AVAILABLE_IN_1_12 -NMTeamLinkWatcher *nm_team_link_watcher_new_nsna_ping (gint init_wait, - gint interval, - gint missed_max, +NMTeamLinkWatcher *nm_team_link_watcher_new_nsna_ping (int init_wait, + int interval, + int missed_max, const char *target_host, GError **error); NM_AVAILABLE_IN_1_12 -NMTeamLinkWatcher *nm_team_link_watcher_new_arp_ping (gint init_wait, - gint interval, - gint missed_max, +NMTeamLinkWatcher *nm_team_link_watcher_new_arp_ping (int init_wait, + int interval, + int missed_max, const char *target_host, const char *source_host, NMTeamLinkWatcherArpPingFlags flags, @@ -174,13 +174,13 @@ NMSetting * nm_setting_team_new (void); const char * nm_setting_team_get_config (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_notify_peers_count (NMSettingTeam *setting); +int nm_setting_team_get_notify_peers_count (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_notify_peers_interval (NMSettingTeam *setting); +int nm_setting_team_get_notify_peers_interval (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_mcast_rejoin_count (NMSettingTeam *setting); +int nm_setting_team_get_mcast_rejoin_count (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_mcast_rejoin_interval (NMSettingTeam *setting); +int nm_setting_team_get_mcast_rejoin_interval (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 const char * nm_setting_team_get_runner (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 @@ -188,15 +188,15 @@ const char * nm_setting_team_get_runner_hwaddr_policy (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 const char * nm_setting_team_get_runner_tx_balancer (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_runner_tx_balancer_interval (NMSettingTeam *setting); +int nm_setting_team_get_runner_tx_balancer_interval (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 gboolean nm_setting_team_get_runner_active (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 gboolean nm_setting_team_get_runner_fast_rate (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_runner_sys_prio (NMSettingTeam *setting); +int nm_setting_team_get_runner_sys_prio (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 -gint nm_setting_team_get_runner_min_ports (NMSettingTeam *setting); +int nm_setting_team_get_runner_min_ports (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 const char * nm_setting_team_get_runner_agg_select_policy (NMSettingTeam *setting); NM_AVAILABLE_IN_1_12 diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index 56e44b76cf..b9bea9e4cd 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -133,7 +133,7 @@ static NMVlanQosMapping * priority_map_new_from_str (NMVlanPriorityMap map, const char *str) { NMVlanQosMapping *p = NULL; - gchar **t = NULL; + char **t = NULL; guint32 len; guint64 from, to; @@ -175,7 +175,7 @@ get_map (NMSettingVlan *self, NMVlanPriorityMap map) return NULL; } -static gint +static int prio_map_compare (gconstpointer p_a, gconstpointer p_b) { const NMVlanQosMapping *a = p_a; diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 3c3292ea34..fa1f3fdfba 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -308,7 +308,7 @@ nm_setting_lookup_type (const char *name) return info ? info->type : G_TYPE_INVALID; } -gint +int _nm_setting_compare_priority (gconstpointer a, gconstpointer b) { NMSettingPriority prio_a, prio_b; @@ -1273,7 +1273,7 @@ nm_setting_compare (NMSetting *a, { GParamSpec **property_specs; guint n_property_specs; - gint same = TRUE; + int same = TRUE; guint i; g_return_val_if_fail (NM_IS_SETTING (a), FALSE); diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index 47a2fdc1d4..536aea709d 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -172,7 +172,7 @@ typedef struct { GObjectClass parent; /* Virtual functions */ - gint (*verify) (NMSetting *setting, + int (*verify) (NMSetting *setting, NMConnection *connection, GError **error); diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 702e05f4b8..62da974f19 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -309,19 +309,19 @@ nm_utils_ssid_to_utf8 (const guint8 *ssid, gsize len) g_return_val_if_fail (ssid != NULL, NULL); - if (g_utf8_validate ((const gchar *) ssid, len, NULL)) - return g_strndup ((const gchar *) ssid, len); + if (g_utf8_validate ((const char *) ssid, len, NULL)) + return g_strndup ((const char *) ssid, len); encodings = get_system_encodings (); for (e = encodings; *e; e++) { - converted = g_convert ((const gchar *) ssid, len, "UTF-8", *e, NULL, NULL, NULL); + converted = g_convert ((const char *) ssid, len, "UTF-8", *e, NULL, NULL, NULL); if (converted) break; } if (!converted) { - converted = g_convert_with_fallback ((const gchar *) ssid, len, + converted = g_convert_with_fallback ((const char *) ssid, len, "UTF-8", encodings[0], "?", NULL, NULL, NULL); } @@ -332,7 +332,7 @@ nm_utils_ssid_to_utf8 (const guint8 *ssid, gsize len) */ /* Use the printable range of 0x20-0x7E */ - gchar *valid_chars = " !\"#$%&'()*+,-./0123456789:;<=>?@" + char *valid_chars = " !\"#$%&'()*+,-./0123456789:;<=>?@" "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`" "abcdefghijklmnopqrstuvwxyz{|}~"; @@ -4895,7 +4895,7 @@ nm_utils_enum_from_str (GType type, const char *str, * * Since: 1.2 */ -const char **nm_utils_enum_get_values (GType type, gint from, gint to) +const char **nm_utils_enum_get_values (GType type, int from, int to) { return _nm_utils_enum_get_values (type, from, to); } diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index 7024586967..87463ac3cb 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -213,7 +213,7 @@ NM_AVAILABLE_IN_1_2 gboolean nm_utils_enum_from_str (GType type, const char *str, int *out_value, char **err_token); NM_AVAILABLE_IN_1_2 -const char **nm_utils_enum_get_values (GType type, gint from, gint to); +const char **nm_utils_enum_get_values (GType type, int from, int to); NM_AVAILABLE_IN_1_6 guint nm_utils_version (void); diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 5c3926f081..ffa4da0213 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -223,8 +223,8 @@ test_nm_g_slice_free_fcn (void) p = g_slice_new (gint32); (nm_g_slice_free_fcn (gint32)) (p); - p = g_slice_new (gint); - (nm_g_slice_free_fcn (gint)) (p); + p = g_slice_new (int); + (nm_g_slice_free_fcn (int)) (p); p = g_slice_new (gint64); nm_g_slice_free_fcn_gint64 (p); @@ -6034,7 +6034,7 @@ static void test_nm_utils_is_power_of_two (void) { guint64 xyes, xno; - gint i, j; + int i, j; GRand *rand = nmtst_get_rand (); int numbits; @@ -6952,7 +6952,7 @@ test_route_attributes_format (void) /*****************************************************************************/ static gboolean -do_test_nm_set_out_called (gint *call_count) +do_test_nm_set_out_called (int *call_count) { (*call_count)++; return TRUE; |