diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-04-30 13:46:24 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-04-30 16:24:52 +0200 |
| commit | 1b5925ce881370a1aba347cea0afe61e6316e81a (patch) | |
| tree | 1517885acc27984eefe835331a8de97e208c1b19 | |
| parent | e09b2314b94effae147423faa38cdf49027cd545 (diff) | |
all: remove consecutive empty lines
Normalize coding style by removing consecutive empty lines from C
sources and headers.
https://github.com/NetworkManager/NetworkManager/pull/108
189 files changed, 0 insertions, 364 deletions
diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 46725c94f..bbfe47fb4 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -136,7 +136,6 @@ secrets_requested (NMSecretAgentSimple *agent, nm_secret_agent_simple_response (agent, request_id, NULL); } - static NMCResultCode do_agent_secret (NmCli *nmc, int argc, char **argv) { diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 2c98541b6..32e3f7f42 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -149,7 +149,6 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = { // NM_SETTING_DUMMY_SETTING_NAME // NM_SETTING_WIMAX_SETTING_NAME - const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[] = { NMC_META_GENERIC ("GROUP"), /* 0 */ NMC_META_GENERIC ("TYPE"), /* 1 */ @@ -2348,8 +2347,6 @@ parse_passwords (const char *passwd_file, GError **error) return g_steal_pointer (&pwds_hash); } - - static gboolean nmc_activate_connection (NmCli *nmc, NMConnection *connection, @@ -7682,7 +7679,6 @@ editor_init_new_connection (NmCli *nmc, NMConnection *connection, const char *sl NULL); } - setting = nm_meta_setting_info_editor_new_setting (&nm_meta_setting_infos_editor[NM_META_SETTING_TYPE_IP4_CONFIG], NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI); nm_connection_add_setting (connection, setting); @@ -8446,7 +8442,6 @@ do_connection_import (NmCli *nmc, int argc, char **argv) next_arg (nmc, &argc, &argv, NULL); } - if (argc == 0) { /* nmc_do_cmd() should not call this with argc=0. */ g_assert (!nmc->complete); diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 30675b3fd..43e10fe18 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -51,7 +51,6 @@ const NmcMetaGenericInfo *const nmc_fields_dev_status[] = { }; #define NMC_FIELDS_DEV_STATUS_COMMON "DEVICE,TYPE,STATE,CONNECTION" - const NmcMetaGenericInfo *const nmc_fields_dev_show_general[] = { NMC_META_GENERIC ("NAME"), /* 0 */ NMC_META_GENERIC ("DEVICE"), /* 1 */ @@ -3658,7 +3657,6 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) goto finish; } - if (ssids->len) { g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT); g_variant_builder_init (&array_builder, G_VARIANT_TYPE ("aay")); diff --git a/clients/cli/general.c b/clients/cli/general.c index 647ee5fc0..3d3c6eaf6 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -1148,7 +1148,6 @@ client_state (NMClient *client, GParamSpec *param, NmCli *nmc) g_free (str); } - static void device_overview (NmCli *nmc, NMDevice *device) { @@ -1345,7 +1344,6 @@ do_overview (NmCli *nmc, int argc, char **argv) if (nm_device_get_description (devices[i]) && strcmp (nm_device_get_description (devices[i]), "")) g_print ("\t\"%s\"\n", nm_device_get_description (devices[i])); - device_overview (nmc, devices[i]); if (ac) ac_overview (nmc, ac); diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 71fdcf308..4caadab2c 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -204,7 +204,6 @@ next_arg (NmCli *nmc, int *argc, char ***argv, ...) if (*argc == 0) return -1; - va_start (args, argv); if (nmc && nmc->complete && *argc == 1) { diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index ede95a10a..dcf0eed39 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -609,7 +609,6 @@ _get_text_hidden (NMMetaAccessorGetType get_type) return NM_META_TEXT_HIDDEN; } - /*****************************************************************************/ G_GNUC_PRINTF (4, 5) @@ -1191,7 +1190,6 @@ _set_fcn_gobject_mac (ARGS_SET_FCN) else mode = NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT; - if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND) valid = nm_utils_hwaddr_valid (value, INFINIBAND_ALEN); else { @@ -1688,7 +1686,6 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) return TRUE; \ } - static gboolean verify_string_list (const char *const*strv, const char *prop, @@ -3091,7 +3088,6 @@ _set_fcn_infiniband_p_key (ARGS_SET_FCN) return TRUE; } - static gconstpointer _get_fcn_infiniband_p_key (ARGS_GET_FCN) { @@ -4421,7 +4417,6 @@ _describe_fcn_wired_s390_options (ARGS_DESCRIBE_FCN) return (*out_to_free = s); } - static gconstpointer _get_fcn_wireless_ssid (ARGS_GET_FCN) { @@ -4936,7 +4931,6 @@ static const NMMetaPropertyType _pt_gobject_devices = { "Example:\n" \ " name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n") - #define DEFINE_DCB_PROPRITY_PROPERTY_TYPE \ .property_type = &_pt_gobject_int, \ .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \ diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h index ea13acdda..d69f8eca2 100644 --- a/clients/common/nm-polkit-listener.h +++ b/clients/common/nm-polkit-listener.h @@ -129,7 +129,6 @@ typedef void (*NMPolkitListenerOnShowErrorFunc) (const char *text); */ typedef void (*NMPolkitListenerOnCompletedFunc) (gboolean gained_authorization); - struct _NMPolkitListener { PolkitAgentListener parent; }; diff --git a/clients/tui/newt/nmt-newt-button-box.h b/clients/tui/newt/nmt-newt-button-box.h index dec2c3475..2dce16891 100644 --- a/clients/tui/newt/nmt-newt-button-box.h +++ b/clients/tui/newt/nmt-newt-button-box.h @@ -57,5 +57,4 @@ void nmt_newt_button_box_add_widget_start (NmtNewtButtonBox *bbox, void nmt_newt_button_box_add_widget_end (NmtNewtButtonBox *bbox, NmtNewtWidget *widget); - #endif /* NMT_NEWT_BUTTON_BOX_H */ diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index c1756da05..356c0b4bf 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -319,7 +319,6 @@ listbox_activated (NmtNewtWidget *listbox, gpointer list) edit_clicked (NMT_NEWT_BUTTON (priv->edit), list); } - static void connection_saved (GObject *conn, GAsyncResult *result, diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index 4826ba9bc..bc8a78433 100644 --- a/clients/tui/nmt-editor-grid.c +++ b/clients/tui/nmt-editor-grid.c @@ -369,7 +369,6 @@ nmt_editor_grid_size_request (NmtNewtWidget *widget, *width += 2; } - static void nmt_editor_grid_size_allocate (NmtNewtWidget *widget, int x, diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index 515e34717..b18f23d54 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -153,7 +153,6 @@ page_saved (gpointer data, gpointer user_data) nmt_editor_page_saved (page); } - static void save_connection_and_exit (NmtNewtButton *button, gpointer user_data) diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 7d4921963..23c2ab1cb 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -34,7 +34,6 @@ #include "nm-common-macros.h" - G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) #define NMT_MAC_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMT_TYPE_MAC_ENTRY, NmtMacEntryPrivate)) diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index 35625fe4c..00439c19e 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -384,7 +384,6 @@ nmt_page_wifi_finalize (GObject *object) G_OBJECT_CLASS (nmt_page_wifi_parent_class)->finalize (object); } - static void nmt_page_wifi_class_init (NmtPageWifiClass *wifi_class) { diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c index 64a4b9ef6..5e090e2c2 100644 --- a/dispatcher/nm-dispatcher-utils.c +++ b/dispatcher/nm-dispatcher-utils.c @@ -414,7 +414,6 @@ nm_dispatcher_utils_construct_envp (const char *action, if (g_variant_lookup (connection_props, NMD_CONNECTION_PROPS_FILENAME, "&s", &filename)) items = g_slist_prepend (items, g_strdup_printf ("CONNECTION_FILENAME=%s", filename)); - /* Canonicalize the VPN interface name; "" is used when passing it through * D-Bus so make sure that's fixed up here. */ diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index efab0a538..ca11523ab 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -862,7 +862,6 @@ log_handler (const gchar *log_domain, syslog (syslog_priority, "%s", message); } - static void logging_setup (void) { @@ -919,7 +918,6 @@ main (int argc, char **argv) g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM)); g_unix_signal_add (SIGINT, signal_handler, GINT_TO_POINTER (SIGINT)); - if (debug) { if (!g_getenv ("G_MESSAGES_DEBUG")) { /* we log our regular messages using g_debug() and g_info(). diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c index 18b3d680f..e60753522 100644 --- a/examples/C/glib/add-connection-libnm.c +++ b/examples/C/glib/add-connection-libnm.c @@ -97,7 +97,6 @@ add_connection (NMClient *client, GMainLoop *loop, const char *con_name) g_object_unref (connection); } - int main (int argc, char *argv[]) { diff --git a/examples/C/glib/get-active-connections-gdbus.c b/examples/C/glib/get-active-connections-gdbus.c index 033582fb3..1f3858c9b 100644 --- a/examples/C/glib/get-active-connections-gdbus.c +++ b/examples/C/glib/get-active-connections-gdbus.c @@ -245,7 +245,6 @@ out: g_variant_unref (ret); } - int main (int argc, char *argv[]) { diff --git a/examples/C/glib/monitor-nm-running-gdbus.c b/examples/C/glib/monitor-nm-running-gdbus.c index 68617884e..16e1cfad8 100644 --- a/examples/C/glib/monitor-nm-running-gdbus.c +++ b/examples/C/glib/monitor-nm-running-gdbus.c @@ -48,7 +48,6 @@ on_name_vanished (GDBusConnection *connection, g_print ("Name '%s' does not exist on the system bus => NM is not running\n", name); } - int main (int argc, char *argv[]) { diff --git a/examples/C/glib/monitor-nm-state-gdbus.c b/examples/C/glib/monitor-nm-state-gdbus.c index 204ff570e..fdb4d95d8 100644 --- a/examples/C/glib/monitor-nm-state-gdbus.c +++ b/examples/C/glib/monitor-nm-state-gdbus.c @@ -81,7 +81,6 @@ on_signal (GDBusProxy *proxy, } } - int main (int argc, char *argv[]) { diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 868fb1092..80c21d91b 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 7260ebfdb..663fbe70d 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 6c1e97fe8..ba31a3797 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 ea7bf783c..8389bf361 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 157b9fe8c..d6a147116 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 dc24a5e9f..cd937c67a 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 40bf89daf..3a84bd011 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 98e12ca81..3b4240e64 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 e1631e2d5..986d04880 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 68900e06f..8e6cb87c6 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 d2a364a22..51a883fb8 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 69b9a6d2b..8b3c85de1 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 8eadd0f70..6214656e0 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 ca3e3c517..7c2b45f29 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 f06db32ab..73e1cfc6a 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 456e3fbc3..72722b157 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 6c50178d6..863ea9f3b 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 e0da89aa7..e86988b5b 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 0fea88686..e801e4fd9 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 4496046ed..6296b1abb 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 ad9542771..b902b822d 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 86fbdb012..f49a04da3 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 492b2a660..cd766d8e6 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 38e97a93a..5a2e2cfda 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 1f1576fdf..be14e7c0f 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 4c76ed319..218f0dad2 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 bf3f8e561..47a2fdc1d 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 a535b679c..f9c3eb1c6 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 9c9bc2978..4ef80f1de 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 0f910e36a..0bdd9298b 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 115c397f1..795422796 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 544eb3c06..0f04aee99 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 543ca629a..efb8d9599 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 5961b6fc3..2c9320768 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 d0e0b3777..7f9865c4a 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) { diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 709d44aa8..1e0725ca1 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -34,7 +34,6 @@ #define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist" - struct libnm_glib_ctx { unsigned char check; @@ -65,12 +64,10 @@ typedef struct libnm_glib_callback gpointer user_data; } libnm_glib_callback; - static void _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx); static DBusConnection * _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context); static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state); - static void _libnm_glib_nm_state_cb (DBusPendingCall *pcall, void *user_data) { @@ -184,7 +181,6 @@ _libnm_glib_call_callbacks (libnm_glib_ctx *ctx) g_mutex_unlock (ctx->callbacks_lock); } - static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state) { @@ -215,7 +211,6 @@ _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state) _libnm_glib_call_callbacks (ctx); } - static DBusHandlerResult _libnm_glib_dbus_filter (DBusConnection *connection, DBusMessage *message, @@ -287,7 +282,6 @@ _libnm_glib_dbus_filter (DBusConnection *connection, return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED); } - /* * libnm_glib_dbus_init * @@ -339,7 +333,6 @@ _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context) return (connection); } - /* * libnm_glib_dbus_watcher * @@ -378,7 +371,6 @@ _libnm_glib_dbus_watcher (gpointer user_data) return FALSE; } - /* * libnm_glib_schedule_dbus_watcher * @@ -400,7 +392,6 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx) } } - /* * libnm_glib_dbus_worker * @@ -431,7 +422,6 @@ _libnm_glib_dbus_worker (gpointer user_data) return NULL; } - static void _libnm_glib_ctx_free (libnm_glib_ctx *ctx) { @@ -468,7 +458,6 @@ _libnm_glib_ctx_free (libnm_glib_ctx *ctx) g_free (ctx); } - static libnm_glib_ctx * _libnm_glib_ctx_new (void) { @@ -489,7 +478,6 @@ error: return NULL; } - libnm_glib_ctx * libnm_glib_init (void) { @@ -517,7 +505,6 @@ error: return NULL; } - void libnm_glib_shutdown (libnm_glib_ctx *ctx) { @@ -530,7 +517,6 @@ libnm_glib_shutdown (libnm_glib_ctx *ctx) _libnm_glib_ctx_free (ctx); } - libnm_glib_state libnm_glib_get_network_state (const libnm_glib_ctx *ctx) { @@ -540,7 +526,6 @@ libnm_glib_get_network_state (const libnm_glib_ctx *ctx) return ctx->nm_state; } - guint libnm_glib_register_callback (libnm_glib_ctx *ctx, libnm_glib_callback_func func, @@ -568,7 +553,6 @@ libnm_glib_register_callback (libnm_glib_ctx *ctx, return (callback->id); } - void libnm_glib_unregister_callback (libnm_glib_ctx *ctx, guint id) diff --git a/libnm-glib/libnm_glib.h b/libnm-glib/libnm_glib.h index 01c055d01..4137a8ca4 100644 --- a/libnm-glib/libnm_glib.h +++ b/libnm-glib/libnm_glib.h @@ -41,10 +41,8 @@ typedef enum libnm_glib_state typedef struct libnm_glib_ctx libnm_glib_ctx G_GNUC_DEPRECATED; - typedef void (*libnm_glib_callback_func) (libnm_glib_ctx *libnm_ctx, gpointer user_data) G_GNUC_DEPRECATED; - G_GNUC_DEPRECATED libnm_glib_ctx * libnm_glib_init (void); G_GNUC_DEPRECATED void libnm_glib_shutdown (libnm_glib_ctx *ctx); diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 3b923aa28..88cb375fa 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -563,7 +563,6 @@ constructed (GObject *object) register_properties (NM_ACCESS_POINT (object)); } - static void nm_access_point_class_init (NMAccessPointClass *ap_class) { diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h index 5750c76c5..e9a3fc6b5 100644 --- a/libnm-glib/nm-access-point.h +++ b/libnm-glib/nm-access-point.h @@ -51,7 +51,6 @@ G_BEGIN_DECLS /* DEPRECATED */ #define NM_ACCESS_POINT_HW_ADDRESS "hw-address" - typedef struct { NMObject parent; } NMAccessPoint; diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index aa79e1ac0..a8150755a 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -638,7 +638,6 @@ constructed (GObject *object) register_properties (NM_ACTIVE_CONNECTION (object)); } - static void nm_active_connection_class_init (NMActiveConnectionClass *ap_class) { diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index c340d5e51..d6b3c398d 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -1311,7 +1311,6 @@ nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect) g_value_init (&value, G_TYPE_BOOLEAN); g_value_set_boolean (&value, autoconnect); - NM_DEVICE_GET_PRIVATE (device)->autoconnect = autoconnect; _nm_object_set_property (NM_OBJECT (device), diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index d3f8c830e..56db7e3cd 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -1374,7 +1374,6 @@ _nm_object_suppress_property_updates (NMObject *object, gboolean suppress) priv->suppress_property_updates = suppress; } - void _nm_object_ensure_inited (NMObject *object) { diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 820f9e5ca..eb99ef355 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -67,7 +67,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; typedef struct RemoteCall RemoteCall; typedef void (*RemoteCallFetchResultCb) (RemoteCall *call, DBusGProxyCall *proxy_call, GError *error); - struct RemoteCall { NMRemoteConnection *self; DBusGProxyCall *call; @@ -390,7 +389,6 @@ get_secrets_cb (RemoteCall *call, DBusGProxyCall *proxy_call, GError *error) g_hash_table_destroy (secrets); } - /** * nm_remote_connection_get_secrets: * @connection: the #NMRemoteConnection @@ -708,7 +706,6 @@ init_async (GAsyncInitable *initable, int io_priority, NMRemoteConnectionInitData *init_data; NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (initable); - init_data = g_slice_new0 (NMRemoteConnectionInitData); init_data->connection = NM_REMOTE_CONNECTION (initable); init_data->result = g_simple_async_result_new (G_OBJECT (initable), callback, diff --git a/libnm-glib/nm-remote-connection.h b/libnm-glib/nm-remote-connection.h index 5b746a445..1f951cfa2 100644 --- a/libnm-glib/nm-remote-connection.h +++ b/libnm-glib/nm-remote-connection.h @@ -36,7 +36,6 @@ G_BEGIN_DECLS #define NM_IS_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_CONNECTION)) #define NM_REMOTE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass)) - /** * NMRemoteConnectionError: * @NM_REMOTE_CONNECTION_ERROR_UNKNOWN: unknown or unclassified error diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h index af6cc6036..2f9e00a08 100644 --- a/libnm-glib/nm-remote-settings.h +++ b/libnm-glib/nm-remote-settings.h @@ -59,7 +59,6 @@ typedef enum { #define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark () GQuark nm_remote_settings_error_quark (void); - #define NM_REMOTE_SETTINGS_BUS "bus" #define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running" #define NM_REMOTE_SETTINGS_HOSTNAME "hostname" @@ -71,7 +70,6 @@ GQuark nm_remote_settings_error_quark (void); typedef struct _NMRemoteSettings NMRemoteSettings; typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass; - typedef void (*NMRemoteSettingsAddConnectionFunc) (NMRemoteSettings *settings, NMRemoteConnection *connection, GError *error, @@ -86,7 +84,6 @@ typedef void (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings, GError *error, gpointer user_data); - struct _NMRemoteSettings { GObject parent; }; diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 69c81d072..16e3199dd 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -98,7 +98,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - /*****************************************************************************/ GQuark diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index 7670d2efd..68f495a96 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -55,7 +55,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - /** * nm_vpn_connection_new: * @connection: the #DBusGConnection diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c index f06e77c42..ec554e6ca 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.c +++ b/libnm-glib/nm-vpn-plugin-ui-interface.c @@ -69,7 +69,6 @@ interface_init (gpointer g_iface) initialized = TRUE; } - GType nm_vpn_plugin_ui_interface_get_type (void) { @@ -99,7 +98,6 @@ nm_vpn_plugin_ui_interface_get_type (void) return vpn_plugin_ui_interface_type; } - NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface, NMConnection *connection, @@ -167,7 +165,6 @@ nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface, return TRUE; } - static void widget_interface_init (gpointer g_iface) { diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h index bc5d84360..7d870128c 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.h +++ b/libnm-glib/nm-vpn-plugin-ui-interface.h @@ -37,7 +37,6 @@ typedef struct _NMVpnPluginUiWidgetInterface NMVpnPluginUiWidgetInterface; typedef NMVpnPluginUiInterface * (*NMVpnPluginUiFactory) (GError **error); NMVpnPluginUiInterface *nm_vpn_plugin_ui_factory (GError **error); - /*****************************************************************************/ /* Plugin interface */ /*****************************************************************************/ @@ -93,7 +92,6 @@ typedef enum { NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE } NMVpnPluginUiInterfaceProp; - struct _NMVpnPluginUiInterface { GTypeInterface g_iface; @@ -173,7 +171,6 @@ gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *i NMConnection *connection, GError **error); - /*****************************************************************************/ /* UI widget interface */ /*****************************************************************************/ @@ -224,7 +221,6 @@ gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInte NMConnection *connection, GError **error); - #ifdef NM_VPN_LIBNM_COMPAT #define nm_vpn_editor_plugin_factory nm_vpn_plugin_ui_factory diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 316939ca9..c7c68a8dd 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -122,7 +122,6 @@ enum { static GSList *active_plugins = NULL; - GQuark nm_vpn_plugin_error_quark (void) { @@ -134,7 +133,6 @@ nm_vpn_plugin_error_quark (void) return quark; } - static void nm_vpn_plugin_set_connection (NMVPNPlugin *plugin, DBusGConnection *connection) diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index 9e36e5b9d..d0ab1f5c0 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -278,7 +278,6 @@ constructed (GObject *object) register_properties (NM_WIMAX_NSP (object)); } - static void nm_wimax_nsp_class_init (NMWimaxNspClass *nsp_class) { diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index b6b5968b3..943252033 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -1078,7 +1078,6 @@ test_connection_invalid (void) nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0); nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[2]]); - /************************************************************************** * Modify the invalid connection and make it valid *************************************************************************/ diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index 57bc4faa6..0f3492981 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -229,7 +229,6 @@ test_make_visible (void) dbus_g_proxy_begin_call (proxy, "SetVisible", set_visible_cb, NULL, NULL, G_TYPE_BOOLEAN, TRUE, G_TYPE_INVALID); - /* Wait for the settings service to announce the connection again */ start = time (NULL); do { diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index 5e1c3f9f6..2aa2e357f 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -66,7 +66,6 @@ #define NM_DBUS_INTERFACE_DEVICE_VXLAN NM_DBUS_INTERFACE_DEVICE ".Vxlan" #define NM_DBUS_INTERFACE_DEVICE_GRE NM_DBUS_INTERFACE_DEVICE ".Gre" - #define NM_DBUS_IFACE_SETTINGS "org.freedesktop.NetworkManager.Settings" #define NM_DBUS_PATH_SETTINGS "/org/freedesktop/NetworkManager/Settings" @@ -196,7 +195,6 @@ typedef enum { /*< flags >*/ NM_DEVICE_CAP_IS_SOFTWARE = 0x00000004, } NMDeviceCapabilities; - /** * NMDeviceWifiCapabilities: * @NM_WIFI_DEVICE_CAP_NONE: device has no encryption/authentication capabilities @@ -229,7 +227,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 @@ -343,7 +340,6 @@ typedef enum { /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_LTE = 0x00000008, } NMDeviceModemCapabilities; - /** * NMDeviceState: * @NM_DEVICE_STATE_UNKNOWN: the device's state is unknown @@ -398,7 +394,6 @@ typedef enum { NM_DEVICE_STATE_FAILED = 120, } NMDeviceState; - /** * NMDeviceStateReason: * @NM_DEVICE_STATE_REASON_NONE: No reason given @@ -535,7 +530,6 @@ typedef enum { NM_DEVICE_STATE_REASON_LAST = 0xFFFF, } NMDeviceStateReason; - /** * NMActiveConnectionState: * @NM_ACTIVE_CONNECTION_STATE_UNKNOWN: the state of the connection is unknown diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h index 756619864..39a5d9613 100644 --- a/libnm-util/NetworkManagerVPN.h +++ b/libnm-util/NetworkManagerVPN.h @@ -54,7 +54,6 @@ #define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments" #define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported" - /* * VPN daemon signals */ @@ -89,7 +88,6 @@ typedef enum NMVPNServiceState { NM_VPN_SERVICE_STATE_STOPPED } NMVPNServiceState; - /** * NMVPNConnectionState: * @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is @@ -177,7 +175,6 @@ typedef enum { NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG } NMVPNPluginFailure; - /*** Generic config ***/ /* string: VPN interface name (tun0, tap0, etc) */ @@ -203,7 +200,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 @@ -257,7 +253,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-util/crypto.c b/libnm-util/crypto.c index 9778edebc..5d1a37ffc 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -40,7 +40,6 @@ _nm_crypto_error_quark (void) return quark; } - #define PEM_RSA_KEY_BEGIN "-----BEGIN RSA PRIVATE KEY-----" #define PEM_RSA_KEY_END "-----END RSA PRIVATE KEY-----" diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index b929fdcd1..726cebdca 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -120,10 +120,8 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error); - /*****************************************************************************/ /** @@ -493,7 +491,6 @@ nm_connection_compare (NMConnection *a, return TRUE; } - static void diff_one_connection (NMConnection *a, NMConnection *b, diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 5cb19818e..ae7a47e66 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -1342,7 +1342,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 @@ -2535,7 +2534,6 @@ static void need_secrets_phase2 (NMSetting8021x *self, GPtrArray *secrets, gboolean phase2); - typedef void (*EAPMethodNeedSecretsFunc) (NMSetting8021x *self, GPtrArray *secrets, gboolean phase2); @@ -2601,7 +2599,6 @@ need_secrets_phase2 (NMSetting8021x *self, } } - static GPtrArray * need_secrets (NMSetting *setting) { diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h index 3de8f4c37..b3e1e540a 100644 --- a/libnm-util/nm-setting-8021x.h +++ b/libnm-util/nm-setting-8021x.h @@ -65,7 +65,6 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/ NM_SETTING_802_1X_CK_SCHEME_PATH } NMSetting8021xCKScheme; - #define NM_TYPE_SETTING_802_1X (nm_setting_802_1x_get_type ()) #define NM_SETTING_802_1X(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_802_1X, NMSetting8021x)) #define NM_SETTING_802_1X_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_802_1X, NMSetting8021xClass)) @@ -91,7 +90,6 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_error >*/ #define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark () GQuark nm_setting_802_1x_error_quark (void); - #define NM_SETTING_802_1X_EAP "eap" #define NM_SETTING_802_1X_IDENTITY "identity" #define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity" @@ -291,7 +289,6 @@ NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags ( NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format (NMSetting8021x *setting); - G_END_DECLS #endif /* NM_SETTING_8021X_H */ diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index db0b3e927..d26a5b8f0 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -60,7 +60,6 @@ nm_setting_bluetooth_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingBluetooth, nm_setting_bluetooth, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_BLUETOOTH_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index f56cb428c..5a9b96345 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -61,7 +61,6 @@ nm_setting_bond_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingBond, nm_setting_bond, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_BOND_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index 833728b90..cc189c573 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -64,7 +64,6 @@ nm_setting_bridge_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_BRIDGE_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c index 794945f1c..fc76be60e 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -54,7 +54,6 @@ nm_setting_cdma_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingCdma, nm_setting_cdma, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_CDMA_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index 28d5fca7b..e51d2c91d 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -58,7 +58,6 @@ nm_setting_connection_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingConnection, nm_setting_connection, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_CONNECTION_SETTING_NAME, g_define_type_id, @@ -273,7 +272,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 @@ -753,7 +751,6 @@ nm_setting_connection_get_gateway_ping_timeout (NMSettingConnection *setting) return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->gateway_ping_timeout; } - static gboolean verify (NMSetting *setting, GSList *all_settings, GError **error) { diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index eaed4ff5d..2cd0bdafd 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -64,7 +64,6 @@ nm_setting_dcb_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingDcb, nm_setting_dcb, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_DCB_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-dcb.h b/libnm-util/nm-setting-dcb.h index 626f815d9..2757200e9 100644 --- a/libnm-util/nm-setting-dcb.h +++ b/libnm-util/nm-setting-dcb.h @@ -88,7 +88,6 @@ typedef enum { */ #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" @@ -110,7 +109,6 @@ typedef enum { #define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth" #define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS "priority-traffic-class" - typedef struct { NMSetting parent; } NMSettingDcb; diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index fd11ce67f..82ebde335 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -55,7 +55,6 @@ nm_setting_gsm_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_GSM_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 74f4d3122..6a01fca92 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -990,13 +990,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return TRUE; } - static void nm_setting_ip4_config_init (NMSettingIP4Config *setting) { NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting); - priv->dns = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3); } @@ -1396,7 +1394,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) G_PARAM_STATIC_STRINGS)); } - struct NMIP4Address { guint32 refcount; guint32 address; /* network byte order */ @@ -1607,7 +1604,6 @@ nm_ip4_address_set_gateway (NMIP4Address *address, guint32 gateway) address->gateway = gateway; } - struct NMIP4Route { guint32 refcount; diff --git a/libnm-util/nm-setting-ip4-config.h b/libnm-util/nm-setting-ip4-config.h index 1365de291..4d50547d7 100644 --- a/libnm-util/nm-setting-ip4-config.h +++ b/libnm-util/nm-setting-ip4-config.h @@ -164,7 +164,6 @@ guint32 nm_ip4_route_get_metric (NMIP4Route *route); void nm_ip4_route_set_metric (NMIP4Route *route, guint32 metric); - typedef struct { NMSetting parent; } NMSettingIP4Config; diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 1566fe991..6beeb7da2 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -83,7 +83,6 @@ typedef struct { NMSettingIP6ConfigPrivacy ip6_privacy; } NMSettingIP6ConfigPrivate; - enum { PROP_0, PROP_METHOD, @@ -174,7 +173,6 @@ nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting, guint32 i) { NMSettingIP6ConfigPrivate *priv; - g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), NULL); priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting); @@ -946,7 +944,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return TRUE; } - static void nm_setting_ip6_config_init (NMSettingIP6Config *setting) { diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h index 0a2f00ddc..2a32a9203 100644 --- a/libnm-util/nm-setting-ip6-config.h +++ b/libnm-util/nm-setting-ip6-config.h @@ -69,7 +69,6 @@ GQuark nm_setting_ip6_config_error_quark (void); #define NM_SETTING_IP6_CONFIG_IP6_PRIVACY "ip6-privacy" #define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME "dhcp-hostname" - /** * NM_SETTING_IP6_CONFIG_METHOD_IGNORE: * @@ -143,7 +142,6 @@ typedef enum { NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2 } NMSettingIP6ConfigPrivacy; - typedef struct NMIP6Address NMIP6Address; GType nm_ip6_address_get_type (void); diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index 54b070be5..3437d1a1f 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -53,7 +53,6 @@ nm_setting_ppp_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingPPP, nm_setting_ppp, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_PPP_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c index 5b729c855..e66165fd0 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -55,7 +55,6 @@ nm_setting_pppoe_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingPPPOE, nm_setting_pppoe, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_PPPOE_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h index db5f3afa6..e2e023988 100644 --- a/libnm-util/nm-setting-private.h +++ b/libnm-util/nm-setting-private.h @@ -80,7 +80,6 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting, NMSettingClearSecretsWithFlagsFn func, gpointer user_data); - /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated * connection can be replaced by a already-defined connection. This flag only * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index 8a4b079d8..369c4b109 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -55,7 +55,6 @@ nm_setting_serial_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_SERIAL_SETTING_NAME, g_define_type_id, @@ -73,7 +72,6 @@ typedef struct { guint64 send_delay; } NMSettingSerialPrivate; - enum { PROP_0, PROP_BAUD, diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c index f5dcdc944..0ec40320c 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -61,7 +61,6 @@ nm_setting_team_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingTeam, nm_setting_team, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_TEAM_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index e47fe3949..1fed9eca3 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -63,7 +63,6 @@ nm_setting_vpn_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingVPN, nm_setting_vpn, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_VPN_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c index 60beb9127..102fbb5cf 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -62,7 +62,6 @@ nm_setting_wimax_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_WIMAX_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 4296d5112..8b297ee68 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -60,7 +60,6 @@ nm_setting_wired_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_WIRED_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 22808fea7..00d35a2fe 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -73,7 +73,6 @@ nm_setting_wireless_security_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 3341fc8ba..d3040811c 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -61,7 +61,6 @@ nm_setting_wireless_error_quark (void) return quark; } - G_DEFINE_TYPE_WITH_CODE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_WIRELESS_SETTING_NAME, g_define_type_id, diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 760b3cac2..c74d2d711 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -1329,7 +1329,6 @@ nm_setting_get_virtual_iface_name (NMSetting *setting) return NULL; } - NMSettingVerifyResult _nm_setting_verify_deprecated_virtual_iface_name (const char *interface_name, gboolean allow_missing, diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index ce5cf3f52..1470a69b2 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -62,7 +62,6 @@ typedef enum #define NM_SETTING_ERROR nm_setting_error_quark () GQuark nm_setting_error_quark (void); - /* DEPRECATED AND UNUSED */ #define NM_SETTING_PARAM_SERIALIZE (1 << (0 + G_PARAM_USER_SHIFT)) @@ -79,7 +78,6 @@ GQuark nm_setting_error_quark (void); /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */ - #define NM_SETTING_NAME "name" /** @@ -156,7 +154,6 @@ typedef enum { /* 0x80000000 is used for a private flag */ } NMSettingCompareFlags; - /** * NMSetting: * @@ -167,7 +164,6 @@ typedef struct { GObject parent; } NMSetting; - /** * NMSettingClearSecretsWithFlagsFn: * @setting: The setting for which secrets are being iterated @@ -241,7 +237,6 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting, GParamFlags flags, gpointer user_data); - GType nm_setting_get_type (void); /** diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 5d80b2a4f..584049102 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -127,7 +127,6 @@ static const struct IsoLangToEncodings isoLangEntries2[] = { NULL, {NULL, NULL, NULL} } }; - static GHashTable * langToEncodings5 = NULL; static GHashTable * langToEncodings2 = NULL; @@ -159,7 +158,6 @@ init_lang_to_encodings_hash (void) } } - static gboolean get_encodings_for_lang (const char *lang, char **encoding1, @@ -1105,7 +1103,6 @@ nm_utils_ip4_prefix_to_netmask (guint32 prefix) return _nm_utils_ip4_prefix_to_netmask (prefix); } - /** * nm_utils_ip4_get_default_prefix: * @ip: an IPv4 address (in network byte order) @@ -1674,7 +1671,6 @@ nm_utils_rsa_key_encrypt (const GByteArray *data, GError **error) { - return nm_utils_rsa_key_encrypt_helper (CIPHER_DES_EDE3_CBC, data, in_password, @@ -2578,7 +2574,6 @@ nm_utils_check_virtual_device_compatibility (GType virtual_type, GType other_typ gconstpointer nm_utils_get_private (void); gconstpointer nm_util_get_private (void); - /** * nm_utils_get_private: * diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index 2e6244c6d..ba5bcb830 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -483,7 +483,6 @@ init_dbus (NMObject *object) property_info); } - static void nm_access_point_class_init (NMAccessPointClass *ap_class) { diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index 6560fb8ec..0314667fd 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -580,7 +580,6 @@ init_dbus (NMObject *object) property_info); } - static void nm_active_connection_class_init (NMActiveConnectionClass *ap_class) { diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c index 890e2f851..153a71048 100644 --- a/libnm/nm-checkpoint.c +++ b/libnm/nm-checkpoint.c @@ -163,7 +163,6 @@ init_dbus (NMObject *object) property_info); } - static void nm_checkpoint_class_init (NMCheckpointClass *checkpoint_class) { diff --git a/libnm/nm-client.c b/libnm/nm-client.c index a31a0845e..f74851228 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -754,7 +754,6 @@ nm_client_check_connectivity_finish (NMClient *client, return (NMConnectivityState) g_simple_async_result_get_op_res_gssize (simple); } - /** * nm_client_save_hostname: * @client: the %NMClient @@ -2623,7 +2622,6 @@ obj_nm_inited (GObject *object, GAsyncResult *result, gpointer user_data) } } - static void object_added (GDBusObjectManager *object_manager, GDBusObject *object, gpointer user_data) { @@ -2740,7 +2738,6 @@ objects_created (NMClient *client, GDBusObjectManager *object_manager, GError ** G_CALLBACK (dns_notify), client); } - /* The handlers don't really use the client instance. However * it makes it convenient to unhook them by data. */ g_signal_connect (object_manager, "object-added", diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 6f4a86c95..6259b1227 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -403,7 +403,6 @@ const char *nm_client_get_dns_rc_manager (NMClient *client); NM_AVAILABLE_IN_1_6 const GPtrArray *nm_client_get_dns_configuration (NMClient *client); - NM_AVAILABLE_IN_1_12 const GPtrArray *nm_client_get_checkpoints (NMClient *client); diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c index 3285745dd..a82aa8d06 100644 --- a/libnm/nm-device-adsl.c +++ b/libnm/nm-device-adsl.c @@ -30,7 +30,6 @@ #include "nm-setting-adsl.h" #include "nm-setting-connection.h" - G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE) #define NM_DEVICE_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_ADSL, NMDeviceAdslPrivate)) diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c index e64772198..23c649cc2 100644 --- a/libnm/nm-device-macvlan.c +++ b/libnm/nm-device-macvlan.c @@ -143,7 +143,6 @@ nm_device_macvlan_get_hw_address (NMDeviceMacvlan *device) return nm_str_not_empty (NM_DEVICE_MACVLAN_GET_PRIVATE (device)->hw_address); } - static gboolean connection_compatible (NMDevice *device, NMConnection *connection, GError **error) { diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 9bb8f3912..229d60284 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -1940,7 +1940,6 @@ nm_device_reapply (NMDevice *device, if (!dict) dict = g_variant_new_array (G_VARIANT_TYPE ("{sa{sv}}"), NULL, 0); - ret = nmdbus_device_call_reapply_sync (NM_DEVICE_GET_PRIVATE (device)->proxy, dict, version_id, flags, cancellable, error); if (error && *error) diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h index a729f904f..d5b6a8c4b 100644 --- a/libnm/nm-remote-connection.h +++ b/libnm/nm-remote-connection.h @@ -37,7 +37,6 @@ G_BEGIN_DECLS #define NM_IS_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_CONNECTION)) #define NM_REMOTE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass)) - /* Properties */ #define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection" #define NM_REMOTE_CONNECTION_PATH "path" diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 2339e872a..089a06337 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -533,7 +533,6 @@ nm_remote_settings_save_hostname (NMRemoteSettings *settings, NMRemoteSettingsPrivate *priv; gboolean ret; - g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c index 636c39507..5a3c4e564 100644 --- a/libnm/nm-vpn-connection.c +++ b/libnm/nm-vpn-connection.c @@ -59,7 +59,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - /** * nm_vpn_connection_get_banner: * @vpn: a #NMVpnConnection diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index c5fc615eb..bfafc7b77 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -94,7 +94,6 @@ enum { static GSList *active_plugins = NULL; - static void nm_vpn_plugin_old_set_connection (NMVpnPluginOld *plugin, GDBusConnection *connection) diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 901ffa987..da4c2446c 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -96,7 +96,6 @@ enum { static GSList *active_plugins = NULL; - static void nm_vpn_service_plugin_set_connection (NMVpnServicePlugin *plugin, GDBusConnection *connection) @@ -882,7 +881,6 @@ nm_vpn_service_plugin_get_secret_flags (GHashTable *data, if (!secret_name || !*secret_name) g_return_val_if_reached (FALSE); - s = g_hash_table_lookup (data, nm_construct_name_a ("%s-flags", secret_name, &flag_name_free)); if (!s) diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index 638228821..b40e67dd6 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -1345,10 +1345,8 @@ test_connection_invalid (void) FALSE, &path3); - nmtst_main_loop_run (loop, 1000); - connections = nm_client_get_connections (client); g_assert (connections); diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 25752e9a6..911ef4488 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -526,7 +526,6 @@ test_secret_agent_good (TestSecretAgentData *sadata, gconstpointer test_data) g_assert_cmpint (sadata->secrets_requested, ==, 1); } - static void async_init_cb (GObject *object, GAsyncResult *result, gpointer user_data) { @@ -566,7 +565,6 @@ test_secret_agent_nm_not_running (void) g_main_loop_unref (loop); } - static void registered_changed (GObject *object, GParamSpec *pspec, gpointer user_data) { diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h index f1498dc4e..010f18200 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-utils/nm-glib.h @@ -20,7 +20,6 @@ #ifndef __NM_GLIB_H__ #define __NM_GLIB_H__ - #include <gio/gio.h> #include <string.h> @@ -86,7 +85,6 @@ g_steal_pointer (gpointer pp) (0 ? (*(pp)) : (g_steal_pointer) (pp)) #endif - static inline gboolean _nm_g_strv_contains (const gchar * const *strv, const gchar *str) diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h index cc7205a4c..bd375a35a 100644 --- a/shared/nm-utils/nm-macros-internal.h +++ b/shared/nm-utils/nm-macros-internal.h @@ -1291,7 +1291,6 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro) #define false 0 #endif - #ifdef _G_BOOLEAN_EXPR /* g_assert() uses G_LIKELY(), which in turn uses _G_BOOLEAN_EXPR(). * As glib's implementation uses a local variable _g_boolean_var_, diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index cc33a1aef..244e0ac2c 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -211,7 +211,6 @@ _nmtst_exit (void) \ nmtst_free (); \ } - static inline gboolean nmtst_initialized (void) { @@ -276,7 +275,6 @@ BREAK_INNER_LOOPS: return (char **) g_array_free (result, FALSE); } - /* free instances allocated by nmtst (especially nmtst_init()) on shutdown * to release memory. After nmtst_free(), the test is uninitialized again. */ static inline void @@ -1831,7 +1829,6 @@ nmtst_assert_hwaddr_equals (gconstpointer hwaddr1, gssize hwaddr1_len, const cha nmtst_assert_hwaddr_equals (hwaddr1, hwaddr1_len, expected, __FILE__, __LINE__) #endif - #if defined(__NM_SIMPLE_CONNECTION_H__) && defined(__NM_SETTING_CONNECTION_H__) && defined(__NM_KEYFILE_INTERNAL_H__) static inline NMConnection * diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index b208ffc65..78e1ac19c 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -907,4 +907,3 @@ nm_match_spec_device_by_pllink (const NMPlatformLink *pllink, return no_match_value; } - diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index 96e802455..c74ecd819 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -125,7 +125,6 @@ async_data_unpack (struct AsyncData *async_data) return self; } - /** * Cancel any current attempt to detect the version and cleanup * the related fields. @@ -145,7 +144,6 @@ cleanup_checking (NMBluezManager *self, gboolean do_unwatch_name) } } - static void manager_bdaddr_added_cb (GObject *manager, NMBluezDevice *bt_device, @@ -244,7 +242,6 @@ setup_bluez5 (NMBluezManager *self) nm_bluez5_manager_query_devices (manager); } - static void watch_name_on_appeared (GDBusConnection *connection, const gchar *name, @@ -254,7 +251,6 @@ watch_name_on_appeared (GDBusConnection *connection, check_bluez_and_try_setup (NM_BLUEZ_MANAGER (user_data)); } - static void check_bluez_and_try_setup_final_step (NMBluezManager *self, int bluez_version, const char *reason) { diff --git a/src/devices/nm-device-dummy.c b/src/devices/nm-device-dummy.c index f8bc8e752..9be4d29f2 100644 --- a/src/devices/nm-device-dummy.c +++ b/src/devices/nm-device-dummy.c @@ -187,7 +187,6 @@ nm_device_dummy_class_init (NMDeviceDummyClass *klass) device_class->get_configured_mtu = nm_device_get_configured_mtu_for_wired; } - /*****************************************************************************/ #define NM_TYPE_DUMMY_DEVICE_FACTORY (nm_dummy_device_factory_get_type ()) diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 9b46545b9..43d137aab 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1117,7 +1117,6 @@ dcb_state (NMDevice *device, gboolean timeout) g_return_if_fail (nm_device_get_state (device) == NM_DEVICE_STATE_CONFIG); - carrier = nm_platform_link_is_connected (nm_device_get_platform (device), nm_device_get_ifindex (device)); _LOGD (LOGD_DCB, "dcb_state() wait %d carrier %d timeout %d", priv->dcb_wait, carrier, timeout); diff --git a/src/devices/nm-device-macsec.c b/src/devices/nm-device-macsec.c index 895ea34f6..4eaf54697 100644 --- a/src/devices/nm-device-macsec.c +++ b/src/devices/nm-device-macsec.c @@ -731,7 +731,6 @@ link_changed (NMDevice *device, update_properties (device); } - static void device_state_changed (NMDevice *device, NMDeviceState new_state, diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index b8e748d66..dc4fb3e83 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -389,7 +389,6 @@ update_connection (NMDevice *device, NMConnection *connection) if (priv->props.no_promisc == nm_setting_macvlan_get_promiscuous (s_macvlan)) g_object_set (s_macvlan, NM_SETTING_MACVLAN_PROMISCUOUS, !priv->props.no_promisc, NULL); - if (priv->props.tap != nm_setting_macvlan_get_tap (s_macvlan)) g_object_set (s_macvlan, NM_SETTING_MACVLAN_TAP, !!priv->props.tap, NULL); diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c index c3ce4b735..3846676c1 100644 --- a/src/devices/nm-device-tun.c +++ b/src/devices/nm-device-tun.c @@ -480,7 +480,6 @@ nm_device_tun_class_init (NMDeviceTunClass *klass) g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); } - /*****************************************************************************/ #define NM_TYPE_TUN_DEVICE_FACTORY (nm_tun_device_factory_get_type ()) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index f48ea0c52..28e073d0d 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4218,7 +4218,6 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error) g_return_val_if_fail (priv->iface != NULL, FALSE); g_return_val_if_fail (priv->real, FALSE); - ifindex = nm_device_get_ifindex (self); _LOGD (LOGD_DEVICE, "unrealize (ifindex %d)", ifindex > 0 ? ifindex : 0); @@ -5868,7 +5867,6 @@ activate_stage1_device_prepare (NMDevice *self) nm_device_activate_schedule_stage2_device_config (self); } - /* * nm_device_activate_schedule_stage1_device_prepare * @@ -6070,7 +6068,6 @@ activate_stage2_device_config (NMDevice *self) nm_device_activate_schedule_stage3_ip_config_start (self); } - /* * nm_device_activate_schedule_stage2_device_config * @@ -10970,7 +10967,6 @@ nm_device_get_ip4_config (NMDevice *self) return NM_DEVICE_GET_PRIVATE (self)->ip_config_4; } - static gboolean nm_device_set_ip_config (NMDevice *self, int addr_family, diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index e055f8d57..397123cd3 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -73,7 +73,6 @@ nm_device_state_reason_check (NMDeviceStateReason reason) #define NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "queued-state-change-" #define NM_PENDING_ACTIONPREFIX_ACTIVATION "activation-" - /* Properties */ #define NM_DEVICE_UDI "udi" #define NM_DEVICE_IFACE "interface" diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c index 3f1fe9744..91cf4f4d8 100644 --- a/src/devices/ovs/nm-device-ovs-port.c +++ b/src/devices/ovs/nm-device-ovs-port.c @@ -70,7 +70,6 @@ get_generic_capabilities (NMDevice *device) return NM_DEVICE_CAP_IS_SOFTWARE; } - static gboolean check_connection_compatible (NMDevice *device, NMConnection *connection) { diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c index b8f5a935d..12e7c1f15 100644 --- a/src/devices/ovs/nm-ovsdb.c +++ b/src/devices/ovs/nm-ovsdb.c @@ -1153,7 +1153,6 @@ ovsdb_got_msg (NMOvsdb *self, json_t *msg) return; } - /* This is a message we are not interested in. */ _LOGW ("got an unknown message, ignoring"); } diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index 5d0625f80..c2ac8e19d 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -169,7 +169,6 @@ _test_recv_data0_check (GMainLoop *loop, NMLldpListener *listener) TEST_RECV_DATA_DEFINE (_test_recv_data0, 1, _test_recv_data0_check, &_test_recv_data0_frame0); TEST_RECV_DATA_DEFINE (_test_recv_data0_twice, 1, _test_recv_data0_check, &_test_recv_data0_frame0, &_test_recv_data0_frame0); - TEST_RECV_FRAME_DEFINE (_test_recv_data1_frame0, /* lldp.detailed.pcap from * https://wiki.wireshark.org/SampleCaptures#Link_Layer_Discovery_Protocol_.28LLDP.29 */ diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index cd2c68af8..fd7bf3f76 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -177,7 +177,6 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) nm_device_get_iface (priv->companion)); } - /* wait with continuing configuration untill the companion device is done scanning */ g_object_get (priv->companion, NM_DEVICE_WIFI_SCANNING, &scanning, NULL); if (scanning) { diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index de4af42cf..1590f1662 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -2833,7 +2833,6 @@ handle_ip_config_timeout (NMDeviceWifi *self, return ret; } - static NMActStageReturn act_stage4_ip4_config_timeout (NMDevice *device, NMDeviceStateReason *out_failure_reason) { diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c index 450009f0c..39db3a04c 100644 --- a/src/devices/wifi/nm-iwd-manager.c +++ b/src/devices/wifi/nm-iwd-manager.c @@ -157,7 +157,6 @@ return_error: "No PSK available for this connection"); } - static guint psk_agent_export (GDBusConnection *connection, gpointer user_data, gchar **agent_path, GError **error) diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 9a3744db3..a58eb7875 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -924,7 +924,6 @@ static_stage3_ip4_done (NMModemBroadband *self) _LOGI (" address %s/%d", address_string, address.plen); - nm_modem_get_route_parameters (NM_MODEM (self), &ip4_route_table, &ip4_route_metric, @@ -1283,7 +1282,6 @@ get_sim_ready (MMModem *modem, GError *error = NULL; MMSim *new_sim; - new_sim = mm_modem_get_sim_finish (modem, res, &error); if (new_sim != self->_priv.sim_iface) { g_clear_object (&self->_priv.sim_iface); diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c index a1c6aef25..8b81ac414 100644 --- a/src/devices/wwan/nm-modem-ofono.c +++ b/src/devices/wwan/nm-modem-ofono.c @@ -278,7 +278,6 @@ deactivate_cleanup (NMModem *modem, NMDevice *device) NM_MODEM_CLASS (nm_modem_ofono_parent_class)->deactivate_cleanup (modem, device); } - static gboolean check_connection_compatible (NMModem *modem, NMConnection *connection) diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c index f0aae0400..a561b58a6 100644 --- a/src/devices/wwan/nm-wwan-factory.c +++ b/src/devices/wwan/nm-wwan-factory.c @@ -105,7 +105,6 @@ modem_added_cb (NMModemManager *manager, g_object_unref (device); } - static NMDevice * create_device (NMDeviceFactory *factory, const char *iface, diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h index 0d92d7430..f3c34d3dc 100644 --- a/src/dhcp/nm-dhcp-client.h +++ b/src/dhcp/nm-dhcp-client.h @@ -48,7 +48,6 @@ #define NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED "state-changed" #define NM_DHCP_CLIENT_SIGNAL_PREFIX_DELEGATED "prefix-delegated" - typedef enum { NM_DHCP_STATE_UNKNOWN = 0, NM_DHCP_STATE_BOUND, /* new lease or lease changed */ diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c index 52923310b..16a76d23e 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/dhcp/nm-dhcp-dhclient-utils.c @@ -95,7 +95,6 @@ grab_request_options (GPtrArray *store, const char* line) return end; } - static void add_hostname4 (GString *str, const char *hostname, gboolean use_fqdn) { diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index 738e9f918..5230ed4ad 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -262,7 +262,6 @@ find_existing_config (NMDhcpDhclient *self, int addr_family, const char *iface, return NULL; } - /* NM provides interface-specific options; thus the same dhclient config * file cannot be used since DHCP transactions can happen in parallel. * Since some distros don't have default per-interface dhclient config files, @@ -308,7 +307,6 @@ create_dhclient_config (NMDhcpDhclient *self, return new; } - static gboolean dhclient_start (NMDhcpClient *client, const char *mode_opt, @@ -440,7 +438,6 @@ dhclient_start (NMDhcpClient *client, g_ptr_array_add (argv, (gpointer) system_bus_address_env); } - g_ptr_array_add (argv, (gpointer) iface); g_ptr_array_add (argv, NULL); diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/dhcp/nm-dhcp-dhcpcanon.c index 82b3db4fe..12aa57aa5 100644 --- a/src/dhcp/nm-dhcp-dhcpcanon.c +++ b/src/dhcp/nm-dhcp-dhcpcanon.c @@ -76,7 +76,6 @@ nm_dhcp_dhcpcanon_get_path (void) return nm_utils_find_helper ("dhcpcanon", DHCPCANON_PATH, NULL); } - static gboolean dhcpcanon_start (NMDhcpClient *client, const char *mode_opt, @@ -142,7 +141,6 @@ dhcpcanon_start (NMDhcpClient *client, g_ptr_array_add (argv, (gpointer) system_bus_address_env); } - g_ptr_array_add (argv, (gpointer) iface); g_ptr_array_add (argv, NULL); diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 4f37f0690..8cd80abe8 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -667,7 +667,6 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last } } - /* Add requested options */ for (i = 0; dhcp4_requests[i].name; i++) { if (dhcp4_requests[i].include) diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 10a16e57e..c4ba54caf 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -1951,7 +1951,6 @@ _get_config_variant (NMDnsManager *self) "nameservers", g_variant_builder_end (&strv_builder)); - num = nm_ip_config_get_num_domains (ip_config); num += nm_ip_config_get_num_searches (ip_config); if (num > 0) { diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c index 45d068f9a..93bd95514 100644 --- a/src/nm-audit-manager.c +++ b/src/nm-audit-manager.c @@ -157,7 +157,6 @@ build_message (GPtrArray *fields, AuditBackend backend) return g_string_free (string, FALSE); } - static void nm_audit_log (NMAuditManager *self, GPtrArray *fields, const char *file, guint line, const char *func, gboolean success) diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h index a9921dbd9..9267dfd42 100644 --- a/src/nm-auth-subject.h +++ b/src/nm-auth-subject.h @@ -49,23 +49,18 @@ NMAuthSubject *nm_auth_subject_new_unix_process_from_context (GDBusMethodInvocat NMAuthSubject *nm_auth_subject_new_unix_process_from_message (GDBusConnection *connection, GDBusMessage *message); - NMAuthSubjectType nm_auth_subject_get_subject_type (NMAuthSubject *subject); - gboolean nm_auth_subject_is_internal (NMAuthSubject *subject); - gboolean nm_auth_subject_is_unix_process (NMAuthSubject *subject); gulong nm_auth_subject_get_unix_process_pid (NMAuthSubject *subject); const char *nm_auth_subject_get_unix_process_dbus_sender (NMAuthSubject *subject); - gulong nm_auth_subject_get_unix_process_uid (NMAuthSubject *subject); - const char *nm_auth_subject_to_string (NMAuthSubject *self, char *buf, gsize buf_len); GVariant * nm_auth_subject_unix_process_to_polkit_gvariant (NMAuthSubject *self); diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 5f19eabed..813ef9c8a 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -1001,7 +1001,6 @@ load_global_dns (GKeyFile *keyfile, gboolean internal) return dns_config; } - void nm_global_dns_config_to_dbus (const NMGlobalDnsConfig *dns_config, GValue *value) { diff --git a/src/nm-config-data.h b/src/nm-config-data.h index a11b38b20..650fbe148 100644 --- a/src/nm-config-data.h +++ b/src/nm-config-data.h @@ -100,7 +100,6 @@ typedef enum { /*< flags >*/ /* main-file or config-description changed */ NM_CONFIG_CHANGE_CONFIG_FILES = (1L << 10), - /* any configuration on disk changed */ NM_CONFIG_CHANGE_VALUES = (1L << 11), @@ -110,7 +109,6 @@ typedef enum { /*< flags >*/ /* any internal configuration on disk changed (NetworkManager-intern.conf) */ NM_CONFIG_CHANGE_VALUES_INTERN = (1L << 13), - /* configuration regarding connectivity changed */ NM_CONFIG_CHANGE_CONNECTIVITY = (1L << 14), diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 0d9d83417..1fd1d4e7b 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -2344,7 +2344,6 @@ nm_utils_monotonic_timestamp_as_boottime (gint64 timestamp, gint64 timestamp_ns_ return timestamp - offset; } - #define IPV6_PROPERTY_DIR "/proc/sys/net/ipv6/conf/" #define IPV4_PROPERTY_DIR "/proc/sys/net/ipv4/conf/" G_STATIC_ASSERT (sizeof (IPV4_PROPERTY_DIR) == sizeof (IPV6_PROPERTY_DIR)); @@ -4171,7 +4170,6 @@ nm_utils_parse_dns_domain (const char *domain, gboolean *is_routing) return domain; } - /*****************************************************************************/ GVariant * diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h index 4448e8173..1cdeeb882 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -82,7 +82,6 @@ gboolean nm_dispatcher_call_connectivity (NMConnectivityState state, gpointer user_data, guint *out_call_id); - void nm_dispatcher_call_cancel (guint call_id); void nm_dispatcher_init (void); diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 1c5222df4..f8ff74f23 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -151,7 +151,6 @@ typedef struct _NMIP4ConfigClass NMIP4ConfigClass; GType nm_ip4_config_get_type (void); - NMIP4Config * nm_ip4_config_new (NMDedupMultiIndex *multi_idx, int ifindex); @@ -178,7 +177,6 @@ void nm_ip4_config_merge_setting (NMIP4Config *self, guint32 route_metric); NMSetting *nm_ip4_config_create_setting (const NMIP4Config *self); - void nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src, NMIPConfigMergeFlags merge_flags, diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index c76da9951..77a3eee2d 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -2044,7 +2044,6 @@ nm_ip6_config_get_subnet_for_host (const NMIP6Config *self, const struct in6_add return subnet; } - /*****************************************************************************/ void diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index cd01ed021..9762ef48b 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -96,7 +96,6 @@ typedef struct _NMIP6ConfigClass NMIP6ConfigClass; GType nm_ip6_config_get_type (void); - NMIP6Config * nm_ip6_config_new (struct _NMDedupMultiIndex *multi_idx, int ifindex); NMIP6Config * nm_ip6_config_new_cloned (const NMIP6Config *src); @@ -122,7 +121,6 @@ void nm_ip6_config_merge_setting (NMIP6Config *self, guint32 route_metric); NMSetting *nm_ip6_config_create_setting (const NMIP6Config *self); - void nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src, NMIPConfigMergeFlags merge_flags, diff --git a/src/nm-logging.h b/src/nm-logging.h index 36ba6a5a9..069d1d0d1 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -142,7 +142,6 @@ typedef enum { /*< skip >*/ } \ } G_STMT_END - #define _nm_log_ptr(level, domain, ifname, con_uuid, self, prefix, ...) \ nm_log ((level), \ (domain), \ @@ -182,7 +181,6 @@ _nm_log_ptr_is_debug (NMLogLevel level) } \ } G_STMT_END - #define _nm_log_obj(level, domain, ifname, con_uuid, self, prefix, ...) \ _nm_log_ptr ((level), \ (domain), \ diff --git a/src/nm-manager.h b/src/nm-manager.h index 544445320..5a4628467 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -71,7 +71,6 @@ #define NM_MANAGER_INTERNAL_DEVICE_ADDED "internal-device-added" #define NM_MANAGER_INTERNAL_DEVICE_REMOVED "internal-device-removed" - GType nm_manager_get_type (void); /* nm_manager_setup() should only be used by main.c */ diff --git a/src/nm-pacrunner-manager.c b/src/nm-pacrunner-manager.c index caae8b203..af43edbe2 100644 --- a/src/nm-pacrunner-manager.c +++ b/src/nm-pacrunner-manager.c @@ -421,7 +421,6 @@ nm_pacrunner_manager_send (NMPacrunnerManager *self, g_variant_new_string ("direct")); } - /* Extract stuff from configs */ add_proxy_config (&proxy_data, proxy_config); diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c index 7a3738748..a7e3a7c39 100644 --- a/src/nm-sleep-monitor.c +++ b/src/nm-sleep-monitor.c @@ -29,7 +29,6 @@ #include "nm-core-internal.h" #include "NetworkManagerUtils.h" - #if defined (SUSPEND_RESUME_UPOWER) #define SUSPEND_DBUS_NAME "org.freedesktop.UPower" diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h index da24992ed..c76f510f2 100644 --- a/src/nm-test-utils-core.h +++ b/src/nm-test-utils-core.h @@ -308,7 +308,6 @@ nmtst_platform_ip6_routes_equal_aptr (const NMPObject *const*a, const NMPlatform #endif - #ifdef __NETWORKMANAGER_IP4_CONFIG_H__ #include "nm-utils/nm-dedup-multi.h" @@ -323,7 +322,6 @@ nmtst_ip4_config_new (int ifindex) #endif - #ifdef __NETWORKMANAGER_IP6_CONFIG_H__ #include "nm-utils/nm-dedup-multi.h" diff --git a/src/nm-types.h b/src/nm-types.h index e1991c280..fb48dfef3 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -212,7 +212,6 @@ typedef enum { NM_IP_CONFIG_MERGE_NO_DNS = (1LL << 2), } NMIPConfigMergeFlags; - /** * NMIPRouteTableSyncMode: * @NM_IP_ROUTE_TABLE_SYNC_MODE_MAIN: only the main table is synced. For all @@ -228,7 +227,6 @@ typedef enum { NM_IP_ROUTE_TABLE_SYNC_MODE_ALL = 3, } NMIPRouteTableSyncMode; - /* settings */ typedef struct _NMAgentManager NMAgentManager; typedef struct _NMSecretAgent NMSecretAgent; diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 0ed8fa06f..c6413d967 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -181,7 +181,6 @@ G_STATIC_ASSERT (RTA_MAX == (__RTA_MAX - 1)); #define _NMLOG2(level, ...) _LOG ( level, _NMLOG2_DOMAIN, NULL, __VA_ARGS__) #define _NMLOG2_err(errsv, level, ...) _LOG_err (errsv, level, _NMLOG2_DOMAIN, NULL, __VA_ARGS__) - #define _LOG_print(__level, __domain, __errsv, self, ...) \ G_STMT_START { \ char __prefix[32]; \ @@ -226,7 +225,6 @@ G_STATIC_ASSERT (RTA_MAX == (__RTA_MAX - 1)); } \ } G_STMT_END - #define LOG_FMT_IP_TUNNEL "adding %s '%s' parent %u local %s remote %s" /****************************************************************** @@ -1536,7 +1534,6 @@ _parse_lnk_vlan (const char *kind, struct nlattr *info_data) &obj->_lnk_vlan.n_egress_qos_map)) return NULL; - obj_result = obj; obj = NULL; return obj_result; diff --git a/src/platform/nm-platform-utils.h b/src/platform/nm-platform-utils.h index ea25470e0..97f5630a4 100644 --- a/src/platform/nm-platform-utils.h +++ b/src/platform/nm-platform-utils.h @@ -24,7 +24,6 @@ #include "nm-platform.h" #include "nm-setting-wired.h" - const char *nmp_utils_ethtool_get_driver (int ifindex); gboolean nmp_utils_ethtool_supports_carrier_detect (int ifindex); gboolean nmp_utils_ethtool_supports_vlans (int ifindex); @@ -60,10 +59,8 @@ gboolean nmp_utils_ethtool_get_permanent_address (int ifindex, guint8 *buf, size_t *length); - gboolean nmp_utils_mii_supports_carrier_detect (int ifindex); - struct udev_device; const char *nmp_utils_udev_get_driver (struct udev_device *udevice); diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 84d862d2e..ca9e68f8f 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -2396,7 +2396,6 @@ nm_platform_link_infiniband_delete (NMPlatform *self, return _infiniband_add_add_or_delete (self, parent, p_key, FALSE, NULL); } - gboolean nm_platform_link_infiniband_get_properties (NMPlatform *self, int ifindex, @@ -4651,7 +4650,6 @@ nm_platform_qdisc_sync (NMPlatform *self, ifindex), NULL, NULL); - if (plat_qdiscs) { for (i = 0; i < plat_qdiscs->len; i++) { const NMPObject *q = g_ptr_array_index (plat_qdiscs, i); @@ -4717,7 +4715,6 @@ nm_platform_tfilter_sync (NMPlatform *self, ifindex), NULL, NULL); - if (plat_tfilters) { for (i = 0; i < plat_tfilters->len; i++) { const NMPObject *q = g_ptr_array_index (plat_tfilters, i); @@ -4786,7 +4783,6 @@ _lifetime_to_string (guint32 timestamp, guint32 lifetime, gint32 now, char *buf, return buf; } - static const char * _lifetime_summary_to_string (gint32 now, guint32 timestamp, guint32 preferred, guint32 lifetime, char *buf, size_t buf_size) { @@ -5492,7 +5488,6 @@ nm_platform_ip4_route_to_string (const NMPlatformIP4Route *route, char *buf, gsi _to_string_dev (NULL, route->ifindex, str_dev, sizeof (str_dev)); - g_snprintf (buf, len, "%s" /* table */ "%s/%d" diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index e6cef63ba..2d2bfaab7 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -375,7 +375,6 @@ typedef union { #undef __NMPlatformIPAddress_COMMON - /* Default value for adding an IPv4 route. This is also what iproute2 does. * Note that contrary to IPv6, you can add routes with metric 0 and it is even * the default. @@ -471,7 +470,6 @@ typedef union { \ /*end*/ - typedef struct { __NMPlatformIPRoute_COMMON; union { @@ -595,7 +593,6 @@ typedef struct { #undef __NMPlatformObject_COMMON - typedef struct { gboolean is_ip4; NMPObjectType obj_type; diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 29bb999bb..50e6825bf 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -2387,7 +2387,6 @@ out: return ops_type; } - NMPCacheOpsType nmp_cache_update_link_udev (NMPCache *cache, int ifindex, diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-general.c index 342aa0d61..8708c80f7 100644 --- a/src/platform/tests/test-general.c +++ b/src/platform/tests/test-general.c @@ -27,7 +27,6 @@ #include "nm-test-utils-core.h" - /*****************************************************************************/ static void diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index dcd600ee6..3f2875848 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -1513,7 +1513,6 @@ test_vlan_set_xgress (void) 6, 7); } - { const NMVlanQosMapping ingress_map[] = { { .from = 1, .to = 5 }, @@ -1826,14 +1825,12 @@ test_nl_bugs_veth (void) } g_assert_cmpint (pllink_veth0->parent, ==, ifindex_veth1); - /* The following tests whether we have a workaround for kernel bug * https://bugzilla.redhat.com/show_bug.cgi?id=1285827 in place. */ pllink_veth1 = nm_platform_link_get (NM_PLATFORM_GET, ifindex_veth1); g_assert (pllink_veth1); g_assert_cmpint (pllink_veth1->parent, ==, ifindex_veth0); - /* move one veth peer to another namespace and check that the * parent/IFLA_LINK of the remaining peer properly updates * (https://bugzilla.redhat.com/show_bug.cgi?id=1262908). */ @@ -2381,7 +2378,6 @@ test_netns_push (gpointer fixture, gconstpointer test_data) g_assert_not_reached (); } - for (i = nstack; i >= 1; ) { i--; nmp_netns_pop (nm_platform_netns_get (stack[i].pl->platform)); diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h index 2633e9659..8acc35fca 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -66,7 +66,6 @@ gboolean wifi_utils_get_wowlan (WifiData *data); gboolean wifi_utils_set_powersave (WifiData *data, guint32 powersave); - /* OLPC Mesh-only functions */ guint32 wifi_utils_get_mesh_channel (WifiData *data); diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 0b998372d..abc7c524b 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -817,10 +817,8 @@ nm_settings_connection_delete (NMSettingsConnection *self, return TRUE; } - /*****************************************************************************/ - typedef enum { CALL_ID_TYPE_REQ, CALL_ID_TYPE_IDLE, @@ -1810,7 +1808,6 @@ update_auth_cb (NMSettingsConnection *self, update_complete (self, info, local); } - static const char * get_update_modify_permission (NMConnection *old, NMConnection *new) { diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index 589016996..70518687c 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -48,7 +48,6 @@ #define NM_SETTINGS_CONNECTION_FLAGS "flags" #define NM_SETTINGS_CONNECTION_FILENAME "filename" - /** * NMSettingsConnectionIntFlags: * @NM_SETTINGS_CONNECTION_INT_FLAGS_NONE: no flag set diff --git a/src/settings/nm-settings-plugin.h b/src/settings/nm-settings-plugin.h index 97bb7b65e..8f5e3b3b2 100644 --- a/src/settings/nm-settings-plugin.h +++ b/src/settings/nm-settings-plugin.h @@ -34,7 +34,6 @@ GObject * nm_settings_plugin_factory (void); #define NM_IS_SETTINGS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTINGS_PLUGIN)) #define NM_SETTINGS_PLUGIN_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_SETTINGS_PLUGIN, NMSettingsPluginInterface)) - #define NM_SETTINGS_PLUGIN_NAME "name" #define NM_SETTINGS_PLUGIN_INFO "info" #define NM_SETTINGS_PLUGIN_CAPABILITIES "capabilities" @@ -60,7 +59,6 @@ typedef enum { NM_SETTINGS_PLUGIN_PROP_CAPABILITIES, } NMSettingsPluginProp; - typedef struct _NMSettingsPlugin NMSettingsPlugin; typedef struct { diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c index 40810d220..8f42bd7e9 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c @@ -125,7 +125,6 @@ connection_ifcfg_changed (NMIfcfgConnection *connection, gpointer user_data) path = nm_settings_connection_get_filename (NM_SETTINGS_CONNECTION (connection)); g_return_if_fail (path != NULL); - if (!priv->ifcfg_monitor) { _LOGD ("connection_ifcfg_changed("NM_IFCFG_CONNECTION_LOG_FMTD"): %s", NM_IFCFG_CONNECTION_LOG_ARGD (connection), "ignore event"); return; diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 6ef3f6606..7fa473cb6 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -256,7 +256,6 @@ make_connection_setting (const char *file, } } - nm_clear_g_free (&value); v = svGetValueStr (ifcfg, "ZONE", &value); g_object_set (s_con, NM_SETTING_CONNECTION_ZONE, v, NULL); @@ -4420,7 +4419,6 @@ parse_infiniband_p_key (shvarFile *ifcfg, return ret; } - static NMSetting * make_infiniband_setting (shvarFile *ifcfg, const char *file, diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 8584772e8..bdad73896 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -777,7 +777,6 @@ write_wireless_security_setting (NMConnection *connection, "WPA_PSK_FLAGS", wpa ? nm_setting_wireless_security_get_psk_flags (s_wsec) : NM_SETTING_SECRET_FLAG_NONE); - if (nm_setting_wireless_security_get_pmf (s_wsec) == NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT) svUnsetValue (ifcfg, "PMF"); else { @@ -2164,7 +2163,6 @@ write_tc_setting (NMConnection *connection, shvarFile *ifcfg, GError **error) n++; } - num = nm_setting_tc_config_get_num_tfilters (s_tc); for (n = 1, i = 0; i < num; i++) { NMTCTfilter *tfilter; diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 57bd96e90..4fc0df031 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -542,7 +542,6 @@ verify_cert_or_key (NMSetting8021x *s_compare, return TRUE; } - static void test_read_basic (void) { @@ -5279,7 +5278,6 @@ test_write_gateway (void) nmtst_assert_connection_equals (connection, TRUE, reread, FALSE); } - static void test_write_wifi_open (void) { diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c index 014998a69..94a65ecb9 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c @@ -126,7 +126,6 @@ _recursive_ifparser (const char *eni_file, int quiet) if (!quiet) nm_log_info (LOGD_SETTINGS, " interface-parser: parsing file %s\n", eni_file); - while (!feof(inp)) { char *token[128]; /* 255 chars can only be split into 127 tokens */ diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h index bf9c4465d..7e6c8e347 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h +++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h @@ -20,7 +20,6 @@ * (C) Copyright 2004 Tom Parker */ - #ifndef _INTERFACE_PARSER_H #define _INTERFACE_PARSER_H diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c index 99879c920..37bd64273 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c @@ -37,7 +37,6 @@ #include "nms-ifupdown-plugin.h" #include "nms-ifupdown-parser.h" - static const gchar* _ifupdownplugin_guess_connection_type (if_block *block) { @@ -63,7 +62,6 @@ _ifupdownplugin_guess_connection_type (if_block *block) return ret_type; } - struct _Mapping { const gchar *domain; const gpointer target; @@ -401,7 +399,6 @@ update_wireless_security_setting_from_if_block(NMConnection *connection, curr = curr->next; } - if (security) nm_connection_add_setting (connection, NM_SETTING (wireless_security_setting)); } diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index b46475e8a..b684f926d 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -400,7 +400,6 @@ add_one_ip_route (NMSettingIPConfig *s_ip, nm_ip_route_unref (route); } - static void test_write_wired_connection (void) { @@ -2415,7 +2414,6 @@ test_read_minimal (void) &s_con); nmtst_connection_normalize (con_archetype); - connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_1"); g_object_set (s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection), @@ -2424,7 +2422,6 @@ test_read_minimal (void) nmtst_assert_connection_equals (con_archetype, FALSE, connection, FALSE); g_clear_object (&connection); - connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_2"); g_object_set (s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection), @@ -2451,7 +2448,6 @@ test_read_minimal_slave (void) NULL); nmtst_connection_normalize (con_archetype); - connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_slave_1"); g_object_set (s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection), @@ -2460,7 +2456,6 @@ test_read_minimal_slave (void) nmtst_assert_connection_equals (con_archetype, FALSE, connection, FALSE); g_clear_object (&connection); - connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_slave_2"); g_object_set (s_con, NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection), diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c index 14f5cac82..d8cf28c36 100644 --- a/src/supplicant/nm-supplicant-config.c +++ b/src/supplicant/nm-supplicant-config.c @@ -275,7 +275,6 @@ nm_supplicant_config_finalize (GObject *object) G_OBJECT_CLASS (nm_supplicant_config_parent_class)->finalize (object); } - static void nm_supplicant_config_class_init (NMSupplicantConfigClass *klass) { diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c index 5198d75fb..1db45dc8a 100644 --- a/src/supplicant/nm-supplicant-settings-verify.c +++ b/src/supplicant/nm-supplicant-settings-verify.c @@ -36,7 +36,6 @@ struct Opt { const char ** str_allowed; }; - static gboolean validate_type_int (const struct Opt * opt, const char * value, const guint32 len); @@ -67,7 +66,6 @@ static const struct validate_entry validate_table[] = { { TYPE_KEYWORD, validate_type_keyword }, }; - const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL }; const char * group_allowed[] = { "CCMP", "TKIP", "WEP104", "WEP40", NULL }; const char * proto_allowed[] = { "WPA", "RSN", NULL }; @@ -155,7 +153,6 @@ static const struct Opt opt_table[] = { { "ieee80211w", TYPE_INT, 0, 2, FALSE, NULL }, }; - static gboolean validate_type_int (const struct Opt * opt, const char * value, diff --git a/src/supplicant/nm-supplicant-settings-verify.h b/src/supplicant/nm-supplicant-settings-verify.h index 920343bac..1eec136d9 100644 --- a/src/supplicant/nm-supplicant-settings-verify.h +++ b/src/supplicant/nm-supplicant-settings-verify.h @@ -34,5 +34,4 @@ OptType nm_supplicant_settings_verify_setting (const char * key, const char * value, const guint32 len); - #endif /* __NETWORKMANAGER_SUPPLICANT_SETTINGS_VERIFY_H__ */ diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/supplicant/tests/test-supplicant-config.c index 60ca52586..509e913d8 100644 --- a/src/supplicant/tests/test-supplicant-config.c +++ b/src/supplicant/tests/test-supplicant-config.c @@ -138,7 +138,6 @@ build_supplicant_config (NMConnection *connection, g_assert_no_error (error); g_assert (success); - success = nm_supplicant_config_add_bgscan (config, connection, &error); g_assert_no_error (error); g_assert (success); @@ -146,7 +145,6 @@ build_supplicant_config (NMConnection *connection, return nm_supplicant_config_to_variant (config); } - static NMConnection * new_basic_connection (const char *id, GBytes *ssid, diff --git a/src/systemd/nm-sd.c b/src/systemd/nm-sd.c index 43ae0a8b5..e05b345b5 100644 --- a/src/systemd/nm-sd.c +++ b/src/systemd/nm-sd.c @@ -116,7 +116,6 @@ event_attach (sd_event *event, GMainContext *context) id = g_source_attach ((GSource *) source, context); g_source_unref ((GSource *) source); - if (!event) { *p_default_source_id = id; sd_event_unref (e); diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h index 3a4125a05..1ff2a345b 100644 --- a/src/systemd/sd-adapt/nm-sd-adapt.h +++ b/src/systemd/sd-adapt/nm-sd-adapt.h @@ -178,7 +178,6 @@ sd_notify (int unset_environment, const char *state) #define MAX_HANDLE_SZ 128 #endif - /* * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export * CLOCK_BOOTTIME even though the kernel supports it, so provide a diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 502157566..c0cbe42f5 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -164,12 +164,10 @@ test_config_simple (void) g_assert_cmpstr (value, ==, "51"); g_free (value); - value = nm_config_data_get_connection_default (nm_config_get_data_orig (config), "ipv6.route-metric", NULL); g_assert_cmpstr (value, ==, NULL); g_free (value); - value = nm_config_data_get_connection_default (nm_config_get_data_orig (config), "ipv4.route-metric", NULL); g_assert_cmpstr (value, ==, "50"); g_free (value); @@ -186,7 +184,6 @@ test_config_simple (void) g_assert_cmpstr (value, ==, "52"); g_free (value); - value = nm_config_data_get_connection_default (nm_config_get_data_orig (config), "dummy.test1", dev51); g_assert_cmpstr (value, ==, "yes"); g_free (value); @@ -917,7 +914,6 @@ test_config_signal (void) NMTST_EXPECT_NM_INFO ("config: signal: SIGHUP (no changes from disk)*"); nm_config_reload (config, expected); - /* test with subscribing two signals... * * This test exposes glib bug https://bugzilla.redhat.com/show_bug.cgi?id=1260577 @@ -931,7 +927,6 @@ test_config_signal (void) nm_config_reload (config, NM_CONFIG_CHANGE_CAUSE_SIGUSR2); g_signal_handlers_disconnect_by_func (config, _test_signal_config_changed_cb2, &expected); - g_signal_handlers_disconnect_by_func (config, _test_signal_config_changed_cb, &expected); g_assert (config_data_orig == nm_config_get_data (config)); diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index f67c332ba..a78b53119 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -313,7 +313,6 @@ do_test_nm_utils_kill_child (void) NMTST_EXPECT_NM_DEBUG ("kill child process 'test-s-4' (*): after sending SIGTERM (15) and SIGKILL, process * exited by signal 9 (* usec elapsed)"); test_nm_utils_kill_child_sync_do ("test-s-4", pid4s, SIGTERM, 1, TRUE, &expected_signal_KILL); - NMTST_EXPECT_NM_DEBUG ("kill child process 'test-a-1-1' (*): wait for process to terminate after sending SIGTERM (15) (send SIGKILL in 3000 milliseconds)..."); NMTST_EXPECT_NM_DEBUG ("kill child process 'test-a-1-1' (*): terminated by signal 15 (* usec elapsed)"); test_nm_utils_kill_child_async_do ("test-a-1-1", pid1a_1, SIGTERM, 3000, TRUE, &expected_signal_TERM); diff --git a/src/tests/test-general.c b/src/tests/test-general.c index 38eaf25e9..0d500c62e 100644 --- a/src/tests/test-general.c +++ b/src/tests/test-general.c @@ -709,7 +709,6 @@ test_connection_no_match_ip4_addr (void) NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NULL); - s_ip4 = nm_connection_get_setting_ip4_config (orig); g_assert (s_ip4); g_object_set (G_OBJECT (s_ip4), @@ -1232,7 +1231,6 @@ _do_test_match_spec_config (const char *file, gint line, const char *spec_str, g GSList *specs2 = g_slist_append (NULL, sss); NMMatchSpecMatchType match_result2; - match_result2 = nm_match_spec_config (specs2, version, NULL); if (match_result == NM_MATCH_SPEC_NO_MATCH) g_assert_cmpint (match_result2, ==, NM_MATCH_SPEC_NO_MATCH); @@ -1289,7 +1287,6 @@ test_match_spec_config (void) do_test_match_spec_config ("nm-version-min:1", 1, 3, 30, NM_MATCH_SPEC_MATCH); do_test_match_spec_config ("nm-version-min:1", 1, 4, 30, NM_MATCH_SPEC_MATCH); - do_test_match_spec_config ("nm-version-max:1.2.3", 0, 2, 30, NM_MATCH_SPEC_NO_MATCH); do_test_match_spec_config ("nm-version-max:1.2.3", 1, 1, 1, NM_MATCH_SPEC_NO_MATCH); do_test_match_spec_config ("nm-version-max:1.2.3", 1, 2, 0, NM_MATCH_SPEC_MATCH); diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index 436fc68b4..7d6be84d7 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -2143,7 +2143,6 @@ _name_owner_changed (GObject *object, g_free (owner); } - static gboolean _daemon_exec_timeout (gpointer data) { |