diff options
Diffstat (limited to 'libnm-core')
35 files changed, 0 insertions, 76 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 868fb10924..80c21d91b8 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -515,7 +515,6 @@ nm_connection_compare (NMConnection *a, return TRUE; } - static gboolean diff_one_connection (NMConnection *a, NMConnection *b, diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 7260ebfdb2..663fbe70d2 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -35,7 +35,6 @@ #error Cannot use this header. #endif - #include "nm-connection.h" #include "nm-core-enum-types.h" #include "nm-setting-8021x.h" @@ -117,7 +116,6 @@ */ #define NM_SETTING_COMPARE_FLAG_NONE ((NMSettingCompareFlags) 0) - #define NM_SETTING_SECRET_FLAGS_ALL \ (NM_SETTING_SECRET_FLAG_NONE | \ NM_SETTING_SECRET_FLAG_AGENT_OWNED | \ diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 6c1e97fe87..ba31a37977 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -296,7 +296,6 @@ typedef enum { /*< flags >*/ NM_WIFI_DEVICE_CAP_FREQ_5GHZ = 0x00000400, } NMDeviceWifiCapabilities; - /** * NM80211ApFlags: * @NM_802_11_AP_FLAGS_NONE: access point has no special capabilities @@ -832,7 +831,6 @@ typedef enum { NM_IP_TUNNEL_MODE_VTI6 = 9, } NMIPTunnelMode; - /** * NMCheckpointCreateFlags: * @NM_CHECKPOINT_CREATE_FLAG_NONE: no flags diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index ea7bf783c4..8389bf361e 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -174,7 +174,6 @@ _nm_dbus_signal_connect_data (GDBusProxy *proxy, * Returns: the signal handler ID, as with _nm_signal_connect_data(). */ - static void typecheck_response (GVariant **response, const GVariantType *reply_type, diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h index 157b9fe8c9..d6a1471162 100644 --- a/libnm-core/nm-keyfile-internal.h +++ b/libnm-core/nm-keyfile-internal.h @@ -94,7 +94,6 @@ typedef struct { const char *message; } NMKeyfileReadTypeDataWarn; - NMConnection *nm_keyfile_read (GKeyFile *keyfile, const char *keyfile_name, const char *base_dir, @@ -149,7 +148,6 @@ typedef struct { NMSetting8021x *setting; } NMKeyfileWriteTypeDataCert; - GKeyFile *nm_keyfile_write (NMConnection *connection, NMKeyfileWriteHandler handler, void *user_data, @@ -165,5 +163,4 @@ gboolean _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b); gboolean _nm_keyfile_equals (GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order); gboolean _nm_keyfile_has_values (GKeyFile *keyfile); - #endif /* __NM_KEYFILE_INTERNAL_H__ */ diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c index dc24a5e9f7..cd937c67a6 100644 --- a/libnm-core/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile-utils.c @@ -179,7 +179,6 @@ DEFINE_KF_WRAPPER(uint64, guint64, guint64); DEFINE_KF_WRAPPER(boolean, gboolean, gboolean); DEFINE_KF_WRAPPER(value, gchar*, const gchar*); - gchar ** nm_keyfile_plugin_kf_get_keys (GKeyFile *kf, const char *group, @@ -288,7 +287,6 @@ _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b) return TRUE; } - static gboolean _nm_keyfile_equals_ordered (GKeyFile *kf_a, GKeyFile *kf_b) { diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c index 40bf89daff..3a84bd0113 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -313,7 +313,6 @@ read_field (char **current, const char **out_err_str, const char *characters, co #define DIGITS "0123456789" #define DELIMITERS "/;," - /* The following IPv4 and IPv6 address formats are supported: * * address (DEPRECATED) @@ -583,7 +582,6 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c gs_free IPAddrRouteBuildListData *build_list = NULL; gsize i_build_list, build_list_len = 0; - keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &keys_len, NULL); if (keys_len == 0) diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 98e12ca81d..3b4240e64d 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -1686,7 +1686,6 @@ nm_setting_802_1x_remove_phase2_altsubject_match (NMSetting8021x *setting, guint g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES); } - /** * nm_setting_802_1x_remove_phase2_altsubject_match_by_value: * @setting: the #NMSetting8021x @@ -3060,7 +3059,6 @@ static void need_secrets_phase2 (NMSetting8021x *self, GPtrArray *secrets, gboolean phase2); - typedef void (*EAPMethodNeedSecretsFunc) (NMSetting8021x *self, GPtrArray *secrets, gboolean phase2); @@ -3126,7 +3124,6 @@ need_secrets_phase2 (NMSetting8021x *self, } } - static GPtrArray * need_secrets (NMSetting *setting) { @@ -4423,9 +4420,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - - /** * NMSetting8021x:phase2-client-cert-password: * diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h index e1631e2d51..986d048805 100644 --- a/libnm-core/nm-setting-8021x.h +++ b/libnm-core/nm-setting-8021x.h @@ -280,7 +280,6 @@ gboolean nm_setting_802_1x_set_phase2_ca_cert (NMSetting8 NMSetting8021xCKFormat *out_format, GError **error); - NM_AVAILABLE_IN_1_8 const char * nm_setting_802_1x_get_phase2_ca_cert_password (NMSetting8021x *setting); NM_AVAILABLE_IN_1_8 diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 68900e06f5..8e6cb87c6e 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -288,7 +288,6 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting) return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->type; } - /** * nm_setting_connection_get_num_permissions: * @setting: the #NMSettingConnection @@ -1731,7 +1730,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); - /** * NMSettingConnection:autoconnect-retries: * diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h index d2a364a224..51a883fb89 100644 --- a/libnm-core/nm-setting-dcb.h +++ b/libnm-core/nm-setting-dcb.h @@ -70,7 +70,6 @@ typedef enum { /*< flags >*/ */ #define NM_SETTING_DCB_FCOE_MODE_VN2VN "vn2vn" - /* Properties */ #define NM_SETTING_DCB_APP_FCOE_FLAGS "app-fcoe-flags" #define NM_SETTING_DCB_APP_FCOE_PRIORITY "app-fcoe-priority" diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index 69b9a6d2b0..8b3c85de19 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -72,7 +72,6 @@ void nm_ip_address_set_attribute (NMIPAddress *address, const char *name, GVariant *value); - typedef struct NMIPRoute NMIPRoute; GType nm_ip_route_get_type (void); diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 8eadd0f708..6214656e0b 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -524,7 +524,6 @@ ip4_route_data_set (NMSetting *setting, return TRUE; } - static void nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class) { diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index ca3e3c5173..7c2b45f29f 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -63,7 +63,6 @@ typedef struct { char *token; } NMSettingIP6ConfigPrivate; - enum { PROP_0, PROP_IP6_PRIVACY, @@ -281,7 +280,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return TRUE; } - static void nm_setting_ip6_config_init (NMSettingIP6Config *setting) { @@ -792,7 +790,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); - /* IP6-specific property overrides */ /* ---dbus--- diff --git a/libnm-core/nm-setting-ovs-interface.c b/libnm-core/nm-setting-ovs-interface.c index f06db32abb..73e1cfc6ae 100644 --- a/libnm-core/nm-setting-ovs-interface.c +++ b/libnm-core/nm-setting-ovs-interface.c @@ -244,7 +244,6 @@ normalize: return TRUE; } - static int verify (NMSetting *setting, NMConnection *connection, GError **error) { diff --git a/libnm-core/nm-setting-ovs-port.c b/libnm-core/nm-setting-ovs-port.c index 456e3fbc33..72722b1571 100644 --- a/libnm-core/nm-setting-ovs-port.c +++ b/libnm-core/nm-setting-ovs-port.c @@ -436,7 +436,6 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *setting_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); - /** * NMSettingOvsPort:bond-updelay: * diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index 6c50178d64..863ea9f3b5 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -58,7 +58,6 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting, NMSettingClearSecretsWithFlagsFn func, gpointer user_data); - /* The property of the #NMSetting should be considered during comparisons that * use the %NM_SETTING_COMPARE_FLAG_INFERRABLE flag. Properties that don't have * this flag, are ignored when doing an infrerrable comparison. This flag should diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c index e0da89aa79..e86988b5b4 100644 --- a/libnm-core/nm-setting-serial.c +++ b/libnm-core/nm-setting-serial.c @@ -51,7 +51,6 @@ typedef struct { guint64 send_delay; } NMSettingSerialPrivate; - enum { PROP_0, PROP_BAUD, diff --git a/libnm-core/nm-setting-tc-config.c b/libnm-core/nm-setting-tc-config.c index 0fea88686b..e801e4fd93 100644 --- a/libnm-core/nm-setting-tc-config.c +++ b/libnm-core/nm-setting-tc-config.c @@ -1423,7 +1423,6 @@ _tfilters_from_variant (GVariant *value) action_var = g_variant_lookup_value (tfilter_var, "action", G_VARIANT_TYPE_VARDICT); - if (action_var) { if (!g_variant_lookup (action_var, "kind", "&s", &action_kind)) { //g_warning ("Ignoring tfilter with invalid action"); diff --git a/libnm-core/nm-setting-tc-config.h b/libnm-core/nm-setting-tc-config.h index 4496046edd..6296b1abba 100644 --- a/libnm-core/nm-setting-tc-config.h +++ b/libnm-core/nm-setting-tc-config.h @@ -49,7 +49,6 @@ gboolean nm_tc_qdisc_equal (NMTCQdisc *qdisc, NM_AVAILABLE_IN_1_12 NMTCQdisc *nm_tc_qdisc_dup (NMTCQdisc *qdisc); - NM_AVAILABLE_IN_1_12 const char *nm_tc_qdisc_get_kind (NMTCQdisc *qdisc); NM_AVAILABLE_IN_1_12 @@ -80,7 +79,6 @@ gboolean nm_tc_action_equal (NMTCAction *action, NM_AVAILABLE_IN_1_12 NMTCAction *nm_tc_action_dup (NMTCAction *action); - NM_AVAILABLE_IN_1_12 const char *nm_tc_action_get_kind (NMTCAction *action); @@ -129,7 +127,6 @@ NMTCAction *nm_tc_tfilter_get_action (NMTCTfilter *tfilter); NM_AVAILABLE_IN_1_12 void nm_tc_tfilter_set_action (NMTCTfilter *tfilter, NMTCAction *action); - #define NM_TYPE_SETTING_TC_CONFIG (nm_setting_tc_config_get_type ()) #define NM_SETTING_TC_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_TC_CONFIG, NMSettingTCConfig)) #define NM_SETTING_TC_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_TC_CONFIG, NMSettingTCConfigClass)) diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c index ad95427710..b902b822d8 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/libnm-core/nm-setting-team-port.c @@ -80,7 +80,6 @@ static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = { [PROP_LINK_WATCHERS] = { "link_watch", NULL, NULL, 0 } }; - /** * nm_setting_team_port_new: * diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index 86fbdb0128..f49a04da32 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -1304,7 +1304,6 @@ finalize (GObject *object) G_OBJECT_CLASS (nm_setting_team_parent_class)->finalize (object); } - #define JSON_TO_VAL(typ, id) _nm_utils_json_extract_##typ (priv->config, _prop_to_keys[id], FALSE) static void diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index 492b2a6602..cd766d8e6d 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -52,7 +52,6 @@ typedef enum { /*< flags >*/ #define NM_TEAM_LINK_WATCHER_ARP_PING "arp_ping" #define NM_TEAM_LINK_WATCHER_NSNA_PING "nsna_ping" - typedef struct NMTeamLinkWatcher NMTeamLinkWatcher; GType nm_team_link_watcher_get_type (void); @@ -102,7 +101,6 @@ const char *nm_team_link_watcher_get_source_host (NMTeamLinkWatcher *watcher); NM_AVAILABLE_IN_1_12 NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher *watcher); - #define NM_TYPE_SETTING_TEAM (nm_setting_team_get_type ()) #define NM_SETTING_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_TEAM, NMSettingTeam)) #define NM_SETTING_TEAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_TEAM, NMSettingTeamClass)) @@ -154,7 +152,6 @@ NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher #define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 65535 #define NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO - /** * NMSettingTeam: * diff --git a/libnm-core/nm-setting-user.h b/libnm-core/nm-setting-user.h index 38e97a93ae..5a2e2cfdaf 100644 --- a/libnm-core/nm-setting-user.h +++ b/libnm-core/nm-setting-user.h @@ -57,7 +57,6 @@ const char *nm_setting_user_get_data (NMSettingUser *setting, const NM_AVAILABLE_IN_1_8 gboolean nm_setting_user_set_data (NMSettingUser *setting, const char *key, const char *val, GError **error); - NM_AVAILABLE_IN_1_8 gboolean nm_setting_user_check_key (const char *key, GError **error); NM_AVAILABLE_IN_1_8 diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h index 1f1576fdfe..be14e7c0ff 100644 --- a/libnm-core/nm-setting-vpn.h +++ b/libnm-core/nm-setting-vpn.h @@ -109,7 +109,6 @@ NM_AVAILABLE_IN_1_12 const char ** nm_setting_vpn_get_secret_keys (NMSettingVpn *setting, guint *out_length); - NM_AVAILABLE_IN_1_2 guint32 nm_setting_vpn_get_timeout (NMSettingVpn *setting); diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 4c76ed3199..218f0dad24 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -682,7 +682,6 @@ set_property_from_dbus (const NMSettingProperty *property, return TRUE; } - /** * _nm_setting_to_dbus: * @setting: the #NMSetting diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index bf3f8e561d..47a2fdc1d4 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -51,7 +51,6 @@ G_BEGIN_DECLS /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */ - #define NM_SETTING_NAME "name" /** @@ -130,7 +129,6 @@ typedef enum { /* Higher flags like 0x80000000 and 0x40000000 are used internally as private flags */ } NMSettingCompareFlags; - /** * NMSettingMacRandomization: * @NM_SETTING_MAC_RANDOMIZATION_DEFAULT: the default value, which unless @@ -146,7 +144,6 @@ typedef enum { NM_SETTING_MAC_RANDOMIZATION_ALWAYS, } NMSettingMacRandomization; - /** * NMSetting: * @@ -157,7 +154,6 @@ struct _NMSetting { GObject parent; }; - /** * NMSettingClearSecretsWithFlagsFn: * @setting: The setting for which secrets are being iterated @@ -233,7 +229,6 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting, GParamFlags flags, gpointer user_data); - GType nm_setting_get_type (void); GType nm_setting_lookup_type (const char *name); diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index a535b679c8..f9c3eb1c60 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -136,7 +136,6 @@ static const struct IsoLangToEncodings isoLangEntries2[] = LANG_ENCODINGS (NULL, NULL) }; - static GHashTable * langToEncodings5 = NULL; static GHashTable * langToEncodings2 = NULL; @@ -2237,7 +2236,6 @@ nm_utils_tc_qdisc_to_str (NMTCQdisc *qdisc, GError **error) return g_string_free (string, FALSE); } - static gboolean _tc_read_common_opts (const char *str, guint32 *handle, @@ -3038,7 +3036,6 @@ _nm_utils_check_file (const char *filename, return TRUE; } - gboolean _nm_utils_check_module_file (const char *name, int check_owner, @@ -5018,7 +5015,6 @@ _json_team_add_defaults (json_t *json, json_object_set_new (json_element, "name", json_string (runner)); } - if (nm_streq (runner, NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP)) { _json_add_object (json, "notify_peers", "count", NULL, json_integer (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT_ACTIVEBACKUP_DEFAULT)); @@ -5305,7 +5301,6 @@ fail: return NULL; } - /** * nm_utils_is_json_object: * @str: the JSON string to test @@ -5421,7 +5416,6 @@ out: return ret; } - GValue * _nm_utils_team_config_get (const char *conf, const char *key, diff --git a/libnm-core/nm-vpn-dbus-interface.h b/libnm-core/nm-vpn-dbus-interface.h index 9c9bc29782..4ef80f1dee 100644 --- a/libnm-core/nm-vpn-dbus-interface.h +++ b/libnm-core/nm-vpn-dbus-interface.h @@ -60,7 +60,6 @@ #define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments" #define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported" - /* * VPN daemon signals */ @@ -95,7 +94,6 @@ typedef enum { NM_VPN_SERVICE_STATE_STOPPED } NMVpnServiceState; - /** * NMVpnConnectionState: * @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is @@ -216,7 +214,6 @@ typedef enum { */ #define NM_VPN_PLUGIN_CAN_PERSIST "can-persist" - /*** Ip4Config ***/ /* uint32: IP address of the internal gateway of the subnet the VPN interface is @@ -273,7 +270,6 @@ typedef enum { #define NM_VPN_PLUGIN_IP4_CONFIG_MTU NM_VPN_PLUGIN_CONFIG_MTU #define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV NM_VPN_PLUGIN_CONFIG_TUNDEV - /*** Ip6Config ***/ /* array of uint8: IP address of the internal gateway of the subnet the VPN interface is diff --git a/libnm-core/nm-vpn-editor-plugin.h b/libnm-core/nm-vpn-editor-plugin.h index 0f910e36a7..0bdd9298be 100644 --- a/libnm-core/nm-vpn-editor-plugin.h +++ b/libnm-core/nm-vpn-editor-plugin.h @@ -47,7 +47,6 @@ typedef NMVpnEditorPlugin * (*NMVpnEditorPluginFactory) (GError **error); NMVpnEditorPlugin *nm_vpn_editor_plugin_factory (GError **error); #endif - /*****************************************************************************/ /* Editor plugin interface */ /*****************************************************************************/ diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index 115c397f12..7954227963 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -933,7 +933,6 @@ nm_vpn_plugin_info_supports_multiple (NMVpnPluginInfo *self) return _nm_utils_ascii_str_to_bool (s, FALSE); } - /** * nm_vpn_plugin_info_get_aliases: * @self: plugin info instance diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 544eb3c06d..0f04aee99b 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -6370,7 +6370,6 @@ test_nm_utils_enum_get_values_do (GType type, int from, int to, const char *exp_ g_free (strv); } - static void test_nm_utils_enum (void) { GType bool_enum = nm_test_general_bool_enum_get_type(); @@ -6724,7 +6723,6 @@ test_nm_in_strset (void) _ASSERT (3, !NM_IN_STRSET_SE ("a", G(NULL), G("b"), G("b"))); _ASSERT (3, !NM_IN_STRSET_SE (NULL, G("a"), G("b"), G("b"))); - _ASSERT (3, NM_IN_STRSET ("a", G(NULL), G("b"), G("a"), N("a"))); _ASSERT (4, NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("a"))); _ASSERT (4, !NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d"))); diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c index 543ca629ab..efb8d9599c 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/libnm-core/tests/test-keyfile.c @@ -33,7 +33,6 @@ #include "nm-utils/nm-test-utils.h" - #define TEST_WIRED_TLS_CA_CERT TEST_CERT_DIR"/test-ca-cert.pem" #define TEST_WIRED_TLS_PRIVKEY TEST_CERT_DIR"/test-key-and-cert.pem" @@ -203,7 +202,6 @@ _nm_keyfile_read (GKeyFile *keyfile, return con; } - static void _keyfile_convert (NMConnection **con, GKeyFile **keyfile, @@ -412,14 +410,12 @@ test_8021x_cert (void) g_assert_no_error (error); g_assert (success); - /* test reseting ca-cert to different values and see whether we can write/read. */ nm_connection_add_setting (con, NM_SETTING (s_8021x)); nmtst_assert_connection_verifies_and_normalizable (con); nmtst_connection_normalize (con); - _test_8021x_cert_check (con, scheme, full_TEST_WIRED_TLS_CA_CERT, -1); scheme = NM_SETTING_802_1X_CK_SCHEME_BLOB; @@ -457,7 +453,6 @@ test_8021x_cert_read (void) "/test_8021x_cert_read/test0", NULL); CLEAR (&con, &keyfile); - keyfile = _keyfile_load_from_data ( "[connection]\n" "type=ethernet" @@ -480,7 +475,6 @@ test_8021x_cert_read (void) _keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test2", NULL, NULL, NULL, NULL, NULL, TRUE); CLEAR (&con, &keyfile); - keyfile = _keyfile_load_from_data ( "[connection]\n" "type=802-3-ethernet\n" @@ -523,7 +517,6 @@ test_8021x_cert_read (void) g_assert_cmpint (strlen (nm_setting_802_1x_get_private_key_path (s_8021x)), ==, 505); CLEAR (&con, &keyfile); - keyfile = _keyfile_load_from_data ( "[connection]\n" "type=802-3-ethernet\n" @@ -549,7 +542,6 @@ test_8021x_cert_read (void) _assert_gbytes (nm_setting_802_1x_get_private_key_blob (s_8021x), "hallo", -1); CLEAR (&con, &keyfile); - keyfile = _keyfile_load_from_data ( "[connection]\n" "type=802-3-ethernet\n" @@ -575,7 +567,6 @@ test_8021x_cert_read (void) _assert_gbytes (nm_setting_802_1x_get_private_key_blob (s_8021x), "abc.deR\0", 8); CLEAR (&con, &keyfile); - keyfile = _keyfile_load_from_data ( "[connection]\n" "type=802-3-ethernet\n" diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c index 5961b6fc34..2c9320768d 100644 --- a/libnm-core/tests/test-secrets.c +++ b/libnm-core/tests/test-secrets.c @@ -259,7 +259,6 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) &error); nmtst_assert_success (success, error); - /* IP4 setting */ s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new (); nm_connection_add_setting (connection, NM_SETTING (s_ip4)); diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c index d0e0b37772..7f9865c4a6 100644 --- a/libnm-core/tests/test-setting.c +++ b/libnm-core/tests/test-setting.c @@ -599,7 +599,6 @@ test_bond_normalize (void) NM_SETTING_DCB_FLAG_ADVERTISE | \ NM_SETTING_DCB_FLAG_WILLING) - static void test_dcb_flags_valid (void) { @@ -943,7 +942,6 @@ _test_team_config_sync (const char *team_config, g_assert (nm_setting_verify ((NMSetting *) s_team, NULL, NULL)); } - static void test_runner_roundrobin_sync_from_config (void) { @@ -1183,7 +1181,6 @@ _test_team_port_config_sync (const char *team_port_config, g_assert (nm_setting_verify ((NMSetting *) s_team_port, NULL, NULL)); } - static void test_team_port_default (void) { |