diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-02 18:22:50 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-03 12:01:15 +0200 |
| commit | a83eb773cea118fb4b2b6c3bce03316f73b29b61 (patch) | |
| tree | 96de75e5e61facdbd8a13b71e0afbd4e2cf1581f | |
| parent | 05e66d52025d7cbe8bcfafd93c31aa5a5b852566 (diff) | |
| download | NetworkManager-a83eb773cea118fb4b2b6c3bce03316f73b29b61.tar.gz | |
all: modify line separator comments to be 80 chars wide
sed 's#^/\*\{5\}\*\+/$#/*****************************************************************************/#' $(git grep -l '\*\{5\}' | grep '\.[hc]$') -i
196 files changed, 783 insertions, 783 deletions
diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index 8636f09797..354ab2c5b2 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -30,7 +30,7 @@ #include "nm-utils/nm-test-utils.h" -/*******************************************/ +/*****************************************************************************/ static gboolean parse_main (GKeyFile *kf, @@ -444,7 +444,7 @@ out: return success; } -/*******************************************/ +/*****************************************************************************/ static void test_generic (const char *file, const char *override_vpn_ip_iface) @@ -556,7 +556,7 @@ test_generic (const char *file, const char *override_vpn_ip_iface) g_assert_cmpstr (expected_iface, ==, out_iface); } -/*******************************************/ +/*****************************************************************************/ static void test_up (void) @@ -606,7 +606,7 @@ test_up_empty_vpn_iface (void) test_generic ("dispatcher-up", ""); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 3e9db68f41..5632b1883e 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -77,7 +77,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error); -/*************************************************************/ +/*****************************************************************************/ static void setting_changed_cb (NMSetting *setting, @@ -1860,7 +1860,7 @@ nm_connection_get_virtual_device_description (NMConnection *connection) return g_strdup_printf ("%s (%s)", display_type, iface); } -/*************************************************************/ +/*****************************************************************************/ /** * nm_connection_get_setting_802_1x: @@ -2360,7 +2360,7 @@ nm_connection_get_setting_vlan (NMConnection *connection) return (NMSettingVlan *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VLAN); } -/*************************************************************/ +/*****************************************************************************/ static void nm_connection_private_free (NMConnectionPrivate *priv) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 2a1c69d94b..d7ad49b0f7 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -227,7 +227,7 @@ GVariant *_nm_dbus_proxy_call_sync (GDBusProxy *proxy, gboolean _nm_dbus_error_has_name (GError *error, const char *dbus_error_name); -/***********************************************************/ +/*****************************************************************************/ gboolean _nm_vpn_plugin_info_check_file (const char *filename, gboolean check_absolute, @@ -247,7 +247,7 @@ GSList *_nm_vpn_plugin_info_list_load_dir (const char *dirname, NMUtilsCheckFilePredicate check_file, gpointer user_data); -/***********************************************************/ +/*****************************************************************************/ typedef struct { const char *name; @@ -262,7 +262,7 @@ gboolean _nm_utils_dns_option_validate (const char *option, char **out_name, const NMUtilsDNSOptionDesc *option_descs); int _nm_utils_dns_option_find_idx (GPtrArray *array, const char *option); -/***********************************************************/ +/*****************************************************************************/ typedef struct _NMUtilsStrStrDictKey NMUtilsStrStrDictKey; guint _nm_utils_strstrdictkey_hash (gconstpointer a); @@ -272,7 +272,7 @@ NMUtilsStrStrDictKey *_nm_utils_strstrdictkey_create (const char *v1, const char #define _nm_utils_strstrdictkey_static(v1, v2) \ ( (NMUtilsStrStrDictKey *) ("\03" v1 "\0" v2 "") ) -/***********************************************************/ +/*****************************************************************************/ gboolean _nm_setting_vlan_set_priorities (NMSettingVlan *setting, NMVlanPriorityMap map, @@ -283,7 +283,7 @@ void _nm_setting_vlan_get_priorities (NMSettingVlan *setting, NMVlanQosMapping **out_qos_map, guint *out_n_qos_map); -/***********************************************************/ +/*****************************************************************************/ struct ether_addr; @@ -293,7 +293,7 @@ gboolean _nm_utils_generate_mac_address_mask_parse (const char *value, gsize *out_ouis_len, GError **error); -/***********************************************************/ +/*****************************************************************************/ typedef enum { NM_BOND_OPTION_TYPE_INT, @@ -307,7 +307,7 @@ typedef enum { NMBondOptionType _nm_setting_bond_get_option_type (NMSettingBond *setting, const char *name); -/***********************************************************/ +/*****************************************************************************/ typedef enum { NM_BOND_MODE_UNKNOWN = 0, @@ -323,11 +323,11 @@ typedef enum { NMBondMode _nm_setting_bond_mode_from_string (const char *str); gboolean _nm_setting_bond_option_supported (const char *option, NMBondMode mode); -/***********************************************************/ +/*****************************************************************************/ gboolean _nm_utils_inet6_is_token (const struct in6_addr *in6addr); -/***********************************************************/ +/*****************************************************************************/ gboolean _nm_utils_team_config_equal (const char *conf1, const char *conf2, gboolean port); diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h index 41bec0cf8a..1bf24be8d0 100644 --- a/libnm-core/nm-keyfile-internal.h +++ b/libnm-core/nm-keyfile-internal.h @@ -27,7 +27,7 @@ #include "nm-connection.h" #include "nm-setting-8021x.h" -/*********************************************************/ +/*****************************************************************************/ #define NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB "data:;base64," #define NM_KEYFILE_CERT_SCHEME_PREFIX_PATH "file://" @@ -94,7 +94,7 @@ NMConnection *nm_keyfile_read (GKeyFile *keyfile, void *user_data, GError **error); -/*********************************************************/ +/*****************************************************************************/ typedef enum { NM_KEYFILE_WRITE_TYPE_CERT = 1, @@ -155,7 +155,7 @@ GKeyFile *nm_keyfile_write (NMConnection *connection, void *user_data, GError **error); -/*********************************************************/ +/*****************************************************************************/ char *nm_keyfile_plugin_kf_get_string (GKeyFile *kf, const char *group, const char *key, GError **error); void nm_keyfile_plugin_kf_set_string (GKeyFile *kf, const char *group, const char *key, const char *value); diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c index bdd18bab4c..79b6ea112d 100644 --- a/libnm-core/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile-utils.c @@ -68,7 +68,7 @@ nm_keyfile_plugin_get_setting_name_for_alias (const char *alias) return NULL; } -/**********************************************************************/ +/*****************************************************************************/ /* List helpers */ #define DEFINE_KF_LIST_WRAPPER(stype, get_ctype, set_ctype) \ @@ -202,7 +202,7 @@ nm_keyfile_plugin_kf_has_key (GKeyFile *kf, return has; } -/************************************************************************/ +/*****************************************************************************/ void _nm_keyfile_copy (GKeyFile *dst, GKeyFile *src) @@ -232,7 +232,7 @@ _nm_keyfile_copy (GKeyFile *dst, GKeyFile *src) } } -/************************************************************************/ +/*****************************************************************************/ gboolean _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b) diff --git a/libnm-core/nm-keyfile-utils.h b/libnm-core/nm-keyfile-utils.h index faa027db3f..e7d803ce1e 100644 --- a/libnm-core/nm-keyfile-utils.h +++ b/libnm-core/nm-keyfile-utils.h @@ -29,7 +29,7 @@ const char *nm_keyfile_plugin_get_alias_for_setting_name (const char *setting_na const char *nm_keyfile_plugin_get_setting_name_for_alias (const char *alias); -/*********************************************************/ +/*****************************************************************************/ /* List helpers */ #define DEFINE_KF_LIST_WRAPPER_PROTO(stype, get_ctype, set_ctype) \ diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c index e0e6ba4bf8..4a2fbd1f18 100644 --- a/libnm-core/nm-keyfile-writer.c +++ b/libnm-core/nm-keyfile-writer.c @@ -428,7 +428,7 @@ static const ObjectType objtypes[10] = { { NULL }, }; -/**************************************************************************/ +/*****************************************************************************/ static void cert_writer_default (NMConnection *connection, @@ -540,7 +540,7 @@ cert_writer (KeyfileWriterInfo *info, cert_writer_default (info->connection, info->keyfile, &type_data); } -/**************************************************************************/ +/*****************************************************************************/ typedef struct { const char *setting_name; diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c index df2e7bd334..331fa5aea0 100644 --- a/libnm-core/nm-setting-bridge-port.c +++ b/libnm-core/nm-setting-bridge-port.c @@ -60,7 +60,7 @@ enum { LAST_PROP }; -/**************************************************************************/ +/*****************************************************************************/ /** * nm_setting_bridge_port_get_priority: @@ -104,7 +104,7 @@ nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting) return NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting)->hairpin_mode; } -/**************************************************************************/ +/*****************************************************************************/ #define BR_MAX_PORT_PRIORITY 63 #define BR_DEF_PRIORITY 32 @@ -174,7 +174,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return TRUE; } -/**************************************************************************/ +/*****************************************************************************/ /** * nm_setting_bridge_port_new: diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index f6b801c6bd..abd8b19e3c 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -105,7 +105,7 @@ enum { LAST_PROP }; -/***********************************************************************/ +/*****************************************************************************/ #define PERM_USER_PREFIX "user:" @@ -186,7 +186,7 @@ permission_free (Permission *p) g_slice_free (Permission, p); } -/***********************************************************************/ +/*****************************************************************************/ /** * nm_setting_connection_new: diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index 751904b510..140dc02102 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -506,7 +506,7 @@ nm_setting_dcb_set_priority_traffic_class (NMSettingDcb *setting, } } -/******************************************************************/ +/*****************************************************************************/ #define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \ NM_SETTING_DCB_FLAG_ADVERTISE | \ @@ -724,7 +724,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static void nm_setting_dcb_init (NMSettingDcb *setting) diff --git a/libnm-core/nm-setting-generic.c b/libnm-core/nm-setting-generic.c index a44f83cbb0..09edeb6e1b 100644 --- a/libnm-core/nm-setting-generic.c +++ b/libnm-core/nm-setting-generic.c @@ -46,7 +46,7 @@ typedef struct { int dummy; } NMSettingGenericPrivate; -/**************************************************************************/ +/*****************************************************************************/ /** * nm_setting_generic_new: diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c index f75a51b68c..4b78bde05a 100644 --- a/libnm-core/nm-setting-ip-tunnel.c +++ b/libnm-core/nm-setting-ip-tunnel.c @@ -285,7 +285,7 @@ nm_setting_ip_tunnel_get_mtu (NMSettingIPTunnel *setting) return NM_SETTING_IP_TUNNEL_GET_PRIVATE (setting)->mtu; } -/*********************************************************************/ +/*****************************************************************************/ static gboolean verify (NMSetting *setting, NMConnection *connection, GError **error) diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c index aec3b4f99d..836e6d5e7c 100644 --- a/libnm-core/nm-setting-macvlan.c +++ b/libnm-core/nm-setting-macvlan.c @@ -136,7 +136,7 @@ nm_setting_macvlan_get_tap (NMSettingMacvlan *setting) return NM_SETTING_MACVLAN_GET_PRIVATE (setting)->tap; } -/*********************************************************************/ +/*****************************************************************************/ static void nm_setting_macvlan_init (NMSettingMacvlan *setting) diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index 827a47af23..b27fe65ed3 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -595,7 +595,7 @@ nm_setting_vlan_clear_priorities (NMSettingVlan *setting, NMVlanPriorityMap map) set_map (setting, map, NULL); } -/*********************************************************************/ +/*****************************************************************************/ static void nm_setting_vlan_init (NMSettingVlan *setting) diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c index 57fbfd795f..deedd919ae 100644 --- a/libnm-core/nm-setting-vxlan.c +++ b/libnm-core/nm-setting-vxlan.c @@ -340,7 +340,7 @@ nm_setting_vxlan_get_l3_miss (NMSettingVxlan *setting) return NM_SETTING_VXLAN_GET_PRIVATE (setting)->l3_miss; } -/*********************************************************************/ +/*****************************************************************************/ static void nm_setting_vxlan_init (NMSettingVxlan *setting) diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index fcd8dff760..82467c9c6a 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -74,7 +74,7 @@ enum { PROP_LAST }; -/*************************************************************/ +/*****************************************************************************/ static GHashTable *registered_settings = NULL; static GHashTable *registered_settings_by_type = NULL; @@ -115,7 +115,7 @@ _ensure_registered_constructor (void) } \ } G_STMT_END -/*************************************************************/ +/*****************************************************************************/ /* * _nm_register_setting: @@ -264,7 +264,7 @@ _nm_setting_compare_priority (gconstpointer a, gconstpointer b) return 1; } -/*************************************************************/ +/*****************************************************************************/ gboolean _nm_setting_slave_type_is_valid (const char *slave_type, const char **out_port_type) @@ -288,7 +288,7 @@ _nm_setting_slave_type_is_valid (const char *slave_type, const char **out_port_t return found; } -/*************************************************************/ +/*****************************************************************************/ typedef struct { const char *name; @@ -592,7 +592,7 @@ nm_setting_class_find_property (NMSettingClass *setting_class, const char *prope return find_property (properties, property_name); } -/*************************************************************/ +/*****************************************************************************/ static const GVariantType * variant_type_for_gtype (GType type) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 4e1694696b..f94b217a20 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -2144,7 +2144,7 @@ next: return routes; } -/**********************************************************************************************/ +/*****************************************************************************/ /** * nm_utils_uuid_generate: @@ -2260,7 +2260,7 @@ _nm_utils_uuid_generate_from_strings (const char *string1, ...) return uuid; } -/**********************************************************************************************/ +/*****************************************************************************/ /** * nm_utils_rsa_key_encrypt: @@ -2454,7 +2454,7 @@ nm_utils_file_is_pkcs12 (const char *filename) return crypto_is_pkcs12_file (filename, NULL); } -/**********************************************************************************************/ +/*****************************************************************************/ gboolean _nm_utils_check_file (const char *filename, @@ -2580,7 +2580,7 @@ _nm_utils_check_module_file (const char *name, error); } -/**********************************************************************************************/ +/*****************************************************************************/ /** * nm_utils_file_search_in_paths: @@ -2654,7 +2654,7 @@ NOT_FOUND: return NULL; } -/**********************************************************************************************/ +/*****************************************************************************/ /* Band, channel/frequency stuff for wireless */ struct cf_pair { @@ -4001,7 +4001,7 @@ nm_utils_bond_mode_string_to_int (const char *mode) return -1; } -/**********************************************************************************************/ +/*****************************************************************************/ #define STRSTRDICTKEY_V1_SET 0x01 #define STRSTRDICTKEY_V2_SET 0x02 diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index 7cb02abd0e..32e2a4edf2 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -72,7 +72,7 @@ nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface) G_PARAM_STATIC_STRINGS)); } -/*********************************************************************/ +/*****************************************************************************/ typedef struct { NMVpnPluginInfo *plugin_info; @@ -113,7 +113,7 @@ _private_get (NMVpnEditorPlugin *plugin, gboolean create) #define NM_VPN_EDITOR_PLUGIN_GET_PRIVATE(plugin) _private_get (plugin, TRUE) #define NM_VPN_EDITOR_PLUGIN_TRY_GET_PRIVATE(plugin) _private_get (plugin, FALSE) -/*********************************************************************/ +/*****************************************************************************/ /** * nm_vpn_editor_plugin_get_plugin_info: @@ -178,7 +178,7 @@ nm_vpn_editor_plugin_set_plugin_info (NMVpnEditorPlugin *plugin, NMVpnPluginInfo } -/*********************************************************************/ +/*****************************************************************************/ /** * nm_vpn_editor_plugin_get_vt: @@ -225,7 +225,7 @@ nm_vpn_editor_plugin_get_vt (NMVpnEditorPlugin *plugin, return p_vt_size; } -/*********************************************************************/ +/*****************************************************************************/ static NMVpnEditorPlugin * _nm_vpn_editor_plugin_load (const char *plugin_name, @@ -446,7 +446,7 @@ nm_vpn_editor_plugin_load (const char *plugin_name, error); } -/*********************************************************************/ +/*****************************************************************************/ /** * nm_vpn_editor_plugin_get_editor: diff --git a/libnm-core/nm-vpn-editor-plugin.h b/libnm-core/nm-vpn-editor-plugin.h index fb51f7e621..6d3cf0c781 100644 --- a/libnm-core/nm-vpn-editor-plugin.h +++ b/libnm-core/nm-vpn-editor-plugin.h @@ -48,9 +48,9 @@ NMVpnEditorPlugin *nm_vpn_editor_plugin_factory (GError **error); #endif -/**************************************************/ +/*****************************************************************************/ /* Editor plugin interface */ -/**************************************************/ +/*****************************************************************************/ #define NM_TYPE_VPN_EDITOR_PLUGIN (nm_vpn_editor_plugin_get_type ()) #define NM_VPN_EDITOR_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_EDITOR_PLUGIN, NMVpnEditorPlugin)) diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index d3bc4893aa..14c3588e78 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -67,7 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (NMVpnPluginInfo, nm_vpn_plugin_info, G_TYPE_OBJECT, #define NM_VPN_PLUGIN_INFO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_PLUGIN_INFO, NMVpnPluginInfoPrivate)) -/*********************************************************************/ +/*****************************************************************************/ /** * nm_vpn_plugin_info_validate_filename: @@ -412,7 +412,7 @@ nm_vpn_plugin_info_new_search_file (const char *name, const char *service) return plugin_info; } -/*********************************************************************/ +/*****************************************************************************/ static gboolean _check_no_conflict (NMVpnPluginInfo *i1, NMVpnPluginInfo *i2, GError **error) @@ -775,7 +775,7 @@ nm_vpn_plugin_info_list_get_service_types (GSList *list, return (char **) g_ptr_array_free (l, FALSE); } -/*********************************************************************/ +/*****************************************************************************/ /** * nm_vpn_plugin_info_get_filename: @@ -987,7 +987,7 @@ nm_vpn_plugin_info_lookup_property (NMVpnPluginInfo *self, const char *group, co return g_hash_table_lookup (priv->keys, k); } -/*********************************************************************/ +/*****************************************************************************/ /** * nm_vpn_plugin_info_get_editor_plugin: @@ -1094,7 +1094,7 @@ nm_vpn_plugin_info_load_editor_plugin (NMVpnPluginInfo *self, GError **error) return priv->editor_plugin; } -/*********************************************************************/ +/*****************************************************************************/ /** * nm_vpn_plugin_info_new_from_file: @@ -1152,7 +1152,7 @@ nm_vpn_plugin_info_new_with_data (const char *filename, NULL)); } -/*********************************************************************/ +/*****************************************************************************/ static void nm_vpn_plugin_info_init (NMVpnPluginInfo *plugin) diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index c75abbf999..39ee2ccc3f 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -3318,7 +3318,7 @@ test_setting_old_uuid (void) nmtst_assert_setting_verifies (NM_SETTING (setting)); } -/******************************************************************************/ +/*****************************************************************************/ static void test_connection_normalize_uuid (void) @@ -3335,7 +3335,7 @@ test_connection_normalize_uuid (void) nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY); } -/******************************************************************************/ +/*****************************************************************************/ /* * Test normalization of interface-name @@ -4313,7 +4313,7 @@ test_hexstr2bin (void) } } -/******************************************************************************/ +/*****************************************************************************/ #define UUID_NIL "00000000-0000-0000-0000-000000000000" #define UUID_NS_DNS "6ba7b810-9dad-11d1-80b4-00c04fd430c8" @@ -4367,7 +4367,7 @@ test_nm_utils_uuid_generate_from_string (void) _test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "002a0ada-f547-375a-bab5-896a11d1927e", "a\0b", 3, UUID_NS_DNS); } -/*******************************************/ +/*****************************************************************************/ static void __test_uuid (const char *expected_uuid, const char *str, gssize slen, char *uuid_test) @@ -4414,7 +4414,7 @@ test_nm_utils_uuid_generate_from_strings (void) _test_uuid ("dd265bf7-c05a-3037-9939-b9629858a477", "a\0b\0", 4, "a", "b"); } -/******************************************************************************/ +/*****************************************************************************/ static void test_nm_utils_ascii_str_to_int64_check (const char *str, guint base, gint64 min, @@ -4545,7 +4545,7 @@ test_nm_utils_ascii_str_to_int64 (void) test_nm_utils_ascii_str_to_int64_do ("0x70", 0, G_MININT64, G_MAXINT64, -1, 0, 0x70); } -/******************************************************************************/ +/*****************************************************************************/ static void test_nm_utils_strstrdictkey (void) @@ -4593,7 +4593,7 @@ test_nm_utils_strstrdictkey (void) } } -/******************************************************************************/ +/*****************************************************************************/ static void test_nm_utils_dns_option_validate_do (char *option, gboolean ipv6, const NMUtilsDNSOptionDesc *descs, @@ -4677,7 +4677,7 @@ test_nm_utils_dns_option_find_idx (void) g_ptr_array_free (options, TRUE); } -/******************************************************************************/ +/*****************************************************************************/ static void _json_config_check_valid (const char *conf, gboolean expected) @@ -4781,7 +4781,7 @@ test_nm_utils_team_config_equal (void) #endif } -/******************************************************************************/ +/*****************************************************************************/ enum TEST_IS_POWER_OF_TWP_ENUM_SIGNED { _DUMMY_1 = -1, @@ -4878,7 +4878,7 @@ again: } } -/******************************************************************************/ +/*****************************************************************************/ static void test_g_ptr_array_insert (void) @@ -4903,7 +4903,7 @@ test_g_ptr_array_insert (void) #endif } -/******************************************************************************/ +/*****************************************************************************/ static void test_g_hash_table_get_keys_as_array (void) @@ -4938,7 +4938,7 @@ test_g_hash_table_get_keys_as_array (void) g_hash_table_unref (table); } -/******************************************************************************/ +/*****************************************************************************/ static int _test_find_binary_search_cmp (gconstpointer a, gconstpointer b, gpointer dummy) @@ -5082,7 +5082,7 @@ test_nm_utils_ptrarray_find_binary_search (void) test_find_binary_search_do (-3, -2, -1, 1, 2, 3, 4); } -/******************************************************************************/ +/*****************************************************************************/ static void test_nm_utils_enum_from_str_do (GType type, const char *str, gboolean exp_result, int exp_flags, @@ -5177,7 +5177,7 @@ static void test_nm_utils_enum (void) test_nm_utils_enum_get_values_do (color_flags, 0, G_MAXINT, "blue,red,green"); } -/******************************************************************************/ +/*****************************************************************************/ static int _test_nm_in_set_get (int *call_counter, gboolean allow_called, int value) @@ -5269,7 +5269,7 @@ test_nm_in_set (void) #undef _ASSERT } -/******************************************************************************/ +/*****************************************************************************/ static const char * _test_nm_in_set_getstr (int *call_counter, gboolean allow_called, const char *value) @@ -5397,7 +5397,7 @@ test_nm_in_strset (void) #undef _ASSERT } -/******************************************************************************/ +/*****************************************************************************/ static gboolean do_test_nm_set_out_called (gint *call_count) @@ -5427,7 +5427,7 @@ test_nm_set_out (void) g_assert_cmpint (call_count, ==, 0); } -/******************************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c index b9b211b68b..84dcffbb9f 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/libnm-core/tests/test-keyfile.c @@ -36,7 +36,7 @@ #define TEST_WIRED_TLS_PRIVKEY TEST_CERT_DIR"/test-key-and-cert.pem" -/******************************************************************************/ +/*****************************************************************************/ #define CLEAR(con, keyfile) \ G_STMT_START { \ @@ -219,7 +219,7 @@ _keyfile_convert (NMConnection **con, } } -/******************************************************************************/ +/*****************************************************************************/ static void _test_8021x_cert_check (NMConnection *con, @@ -359,7 +359,7 @@ test_8021x_cert (void) } -/******************************************************************************/ +/*****************************************************************************/ static void test_8021x_cert_read (void) @@ -567,7 +567,7 @@ test_team_conf_read_invalid (void) #endif } -/******************************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 5f34cb292c..0aef3ee400 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -432,7 +432,7 @@ nm_access_point_filter_connections (NMAccessPoint *ap, const GSList *connections return g_slist_reverse (filtered); } -/************************************************************/ +/*****************************************************************************/ static void nm_access_point_init (NMAccessPoint *ap) diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index f0ce64bc31..796019e7a6 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -127,7 +127,7 @@ static void proxy_name_owner_changed (DBusGProxy *proxy, const char *new_owner, gpointer user_data); -/**********************************************************************/ +/*****************************************************************************/ /** * nm_client_error_quark: @@ -148,7 +148,7 @@ nm_client_error_quark (void) return quark; } -/**********************************************************************/ +/*****************************************************************************/ static void nm_client_init (NMClient *client) @@ -1315,7 +1315,7 @@ nm_client_get_activating_connection (NMClient *client) return NM_CLIENT_GET_PRIVATE (client)->activating_connection; } -/****************************************************************/ +/*****************************************************************************/ static void free_devices (NMClient *client, gboolean in_dispose) @@ -1658,7 +1658,7 @@ nm_client_check_connectivity_finish (NMClient *client, return ccd->connectivity; } -/****************************************************************/ +/*****************************************************************************/ /** * nm_client_new: diff --git a/libnm-glib/nm-device-adsl.c b/libnm-glib/nm-device-adsl.c index b8d341f452..30f6c4ec16 100644 --- a/libnm-glib/nm-device-adsl.c +++ b/libnm-glib/nm-device-adsl.c @@ -140,7 +140,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_ADSL; } -/******************************************************************/ +/*****************************************************************************/ static void nm_device_adsl_init (NMDeviceAdsl *device) diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index 2ba34162bd..bd5bc216a7 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -200,7 +200,7 @@ get_hw_address (NMDevice *device) return nm_device_bond_get_hw_address (NM_DEVICE_BOND (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_bond_init (NMDeviceBond *device) diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index d95a21194d..20d65cfad3 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -208,7 +208,7 @@ get_hw_address (NMDevice *device) return nm_device_bridge_get_hw_address (NM_DEVICE_BRIDGE (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_bridge_init (NMDeviceBridge *device) diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 5f6a12f5fe..5cf55c576e 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -232,7 +232,7 @@ get_hw_address (NMDevice *device) return nm_device_bt_get_hw_address (NM_DEVICE_BT (device)); } -/************************************************************/ +/*****************************************************************************/ static void nm_device_bt_init (NMDeviceBt *device) diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c index 46056a2c7b..2817a32053 100644 --- a/libnm-glib/nm-device-ethernet.c +++ b/libnm-glib/nm-device-ethernet.c @@ -235,7 +235,7 @@ get_hw_address (NMDevice *device) return nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_ethernet_init (NMDeviceEthernet *device) diff --git a/libnm-glib/nm-device-generic.c b/libnm-glib/nm-device-generic.c index dd9c24b5c9..206174fb16 100644 --- a/libnm-glib/nm-device-generic.c +++ b/libnm-glib/nm-device-generic.c @@ -112,7 +112,7 @@ nm_device_generic_get_hw_address (NMDeviceGeneric *device) return NM_DEVICE_GENERIC_GET_PRIVATE (device)->hw_address; } -/***********************************************************/ +/*****************************************************************************/ static const char * get_type_description (NMDevice *device) @@ -161,7 +161,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_GENERIC; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_generic_init (NMDeviceGeneric *device) diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index c256c4a1ca..5c4a8c8b9f 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -187,7 +187,7 @@ get_hw_address (NMDevice *device) return nm_device_infiniband_get_hw_address (NM_DEVICE_INFINIBAND (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_infiniband_init (NMDeviceInfiniband *device) diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index 96ce6ca098..d4c156178e 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -176,7 +176,7 @@ get_setting_type (NMDevice *device) return G_TYPE_INVALID; } -/*******************************************************************/ +/*****************************************************************************/ static void nm_device_modem_init (NMDeviceModem *device) diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c index 846b4c51be..df4fb4655e 100644 --- a/libnm-glib/nm-device-olpc-mesh.c +++ b/libnm-glib/nm-device-olpc-mesh.c @@ -185,7 +185,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_OLPC_MESH; } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_olpc_mesh_init (NMDeviceOlpcMesh *device) diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c index 7b50e1852a..2a12a73289 100644 --- a/libnm-glib/nm-device-team.c +++ b/libnm-glib/nm-device-team.c @@ -208,7 +208,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_TEAM; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_team_init (NMDeviceTeam *device) diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c index 28d8ce5761..3f40ec567d 100644 --- a/libnm-glib/nm-device-vlan.c +++ b/libnm-glib/nm-device-vlan.c @@ -233,7 +233,7 @@ get_hw_address (NMDevice *device) return nm_device_vlan_get_hw_address (NM_DEVICE_VLAN (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_vlan_init (NMDeviceVlan *device) diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index 2c12628a9d..08e5b90c10 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -532,7 +532,7 @@ get_hw_address (NMDevice *device) return nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device)); } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_wifi_init (NMDeviceWifi *device) diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c index 9bd733e7fd..cda3601670 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -428,7 +428,7 @@ get_hw_address (NMDevice *device) return nm_device_wimax_get_hw_address (NM_DEVICE_WIMAX (device)); } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_wimax_init (NMDeviceWimax *device) diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index a4dc638adc..5c07f0ecec 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -108,7 +108,7 @@ nm_remote_connection_error_quark (void) return quark; } -/****************************************************************/ +/*****************************************************************************/ static void _nm_remote_connection_ensure_inited (NMRemoteConnection *self) @@ -131,7 +131,7 @@ _nm_remote_connection_ensure_inited (NMRemoteConnection *self) } } -/****************************************************************/ +/*****************************************************************************/ static void remote_call_dbus_cb (DBusGProxy *proxy, DBusGProxyCall *proxy_call, gpointer user_data) @@ -213,7 +213,7 @@ proxy_destroy_cb (DBusGProxy* proxy, gpointer user_data) { proxy_set_destroyed (user_data); } -/****************************************************************/ +/*****************************************************************************/ static void result_cb (RemoteCall *call, DBusGProxyCall *proxy_call, GError *error) @@ -445,7 +445,7 @@ nm_remote_connection_get_unsaved (NMRemoteConnection *connection) return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->unsaved; } -/****************************************************************/ +/*****************************************************************************/ static void updated_get_settings_cb (DBusGProxy *proxy, @@ -531,7 +531,7 @@ properties_changed_cb (DBusGProxy *proxy, } } -/****************************************************************/ +/*****************************************************************************/ /** * nm_remote_connection_new: diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index b64743a99c..6e90db1958 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -170,7 +170,7 @@ enum { }; static guint signals[LAST_SIGNAL] = { 0 }; -/**********************************************************************/ +/*****************************************************************************/ /** * nm_remote_settings_error_quark: @@ -189,7 +189,7 @@ nm_remote_settings_error_quark (void) return quark; } -/**********************************************************************/ +/*****************************************************************************/ static void _nm_remote_settings_ensure_inited (NMRemoteSettings *self) @@ -212,7 +212,7 @@ _nm_remote_settings_ensure_inited (NMRemoteSettings *self) } } -/**********************************************************************/ +/*****************************************************************************/ typedef struct { NMRemoteSettings *self; @@ -1057,7 +1057,7 @@ name_owner_changed (DBusGProxy *proxy, } } -/****************************************************************/ +/*****************************************************************************/ /** * nm_remote_settings_new: diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 03290469ad..aeb7a208ca 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -99,7 +99,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -/********************************************************************/ +/*****************************************************************************/ GQuark nm_secret_agent_error_quark (void) @@ -111,7 +111,7 @@ nm_secret_agent_error_quark (void) return ret; } -/*************************************************************/ +/*****************************************************************************/ static const char * get_nm_owner (NMSecretAgent *self) @@ -512,7 +512,7 @@ impl_secret_agent_delete_secrets (NMSecretAgent *self, g_object_unref (connection); } -/**************************************************************/ +/*****************************************************************************/ static void reg_result (NMSecretAgent *self, GError *error) @@ -692,7 +692,7 @@ auto_register_cb (gpointer user_data) return FALSE; } -/**************************************************************/ +/*****************************************************************************/ /** * nm_secret_agent_get_secrets: @@ -796,7 +796,7 @@ nm_secret_agent_delete_secrets (NMSecretAgent *self, user_data); } -/**************************************************************/ +/*****************************************************************************/ static gboolean validate_identifier (const char *identifier) diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c index 19f19e368d..5fe1eb535c 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -81,7 +81,7 @@ _nm_ssid_demarshal (GValue *value, GByteArray **dest) return TRUE; } -/*****************************/ +/*****************************************************************************/ static gpointer _nm_uint_array_copy (GArray *src) @@ -133,7 +133,7 @@ _nm_uint_array_demarshal (GValue *value, GArray **dest) return TRUE; } -/*****************************/ +/*****************************************************************************/ static gpointer _nm_string_array_copy (GPtrArray *src) @@ -194,7 +194,7 @@ _nm_string_array_demarshal (GValue *value, GPtrArray **dest) return TRUE; } -/*****************************/ +/*****************************************************************************/ static gpointer _nm_object_array_copy (GPtrArray *src) @@ -276,7 +276,7 @@ _nm_object_array_demarshal (GValue *value, return TRUE; } -/*****************************/ +/*****************************************************************************/ static gpointer _nm_ip6_address_object_array_copy (GPtrArray *src) @@ -312,7 +312,7 @@ nm_ip6_address_object_array_get_type (void) return our_type; } -/*****************************/ +/*****************************************************************************/ static gpointer _nm_ip6_address_array_copy (GPtrArray *src) @@ -384,7 +384,7 @@ _nm_ip6_address_array_demarshal (GValue *value, GSList **dest) return TRUE; } -/*****************************/ +/*****************************************************************************/ static gpointer _nm_ip6_route_object_array_copy (GPtrArray *src) diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h index e671e6cfac..37fde91f8c 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.h +++ b/libnm-glib/nm-vpn-plugin-ui-interface.h @@ -38,9 +38,9 @@ typedef NMVpnPluginUiInterface * (*NMVpnPluginUiFactory) (GError **error); NMVpnPluginUiInterface *nm_vpn_plugin_ui_factory (GError **error); -/**************************************************/ +/*****************************************************************************/ /* Plugin interface */ -/**************************************************/ +/*****************************************************************************/ #define NM_TYPE_VPN_PLUGIN_UI_INTERFACE (nm_vpn_plugin_ui_interface_get_type ()) #define NM_VPN_PLUGIN_UI_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN_UI_INTERFACE, NMVpnPluginUiInterface)) @@ -174,9 +174,9 @@ gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *i GError **error); -/**************************************************/ +/*****************************************************************************/ /* UI widget interface */ -/**************************************************/ +/*****************************************************************************/ #define NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE (nm_vpn_plugin_ui_widget_interface_get_type ()) #define NM_VPN_PLUGIN_UI_WIDGET_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE, NMVpnPluginUiWidgetInterface)) diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 0534b766e8..0ea30b58a3 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -508,7 +508,7 @@ impl_vpn_plugin_connect_interactive (NMVPNPlugin *plugin, return _connect_generic (plugin, connection, details, error); } -/***************************************************************/ +/*****************************************************************************/ static gboolean impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin, @@ -635,7 +635,7 @@ nm_vpn_plugin_secrets_required (NMVPNPlugin *plugin, g_signal_emit (plugin, signals[SECRETS_REQUIRED], 0, message, hints); } -/***************************************************************/ +/*****************************************************************************/ static gboolean impl_vpn_plugin_disconnect (NMVPNPlugin *plugin, @@ -684,7 +684,7 @@ impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, return TRUE; } -/*********************************************************************/ +/*****************************************************************************/ static void sigterm_handler (int signum) @@ -706,7 +706,7 @@ setup_unix_signal_handler (void) sigaction (SIGTERM, &action, NULL); } -/*********************************************************************/ +/*****************************************************************************/ static void one_plugin_destroyed (gpointer data, diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index 6a3b8effab..9e36e5b9d0 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -198,7 +198,7 @@ nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp, const GSList *connections) return g_slist_reverse (filtered); } -/************************************************************/ +/*****************************************************************************/ static void nm_wimax_nsp_init (NMWimaxNsp *nsp) diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index 0da93c3fd3..b6b5968b3f 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -39,7 +39,7 @@ static GMainLoop *loop = NULL; static NMTstcServiceInfo *sinfo; -/*******************************************************************/ +/*****************************************************************************/ static gboolean loop_quit (gpointer user_data) @@ -93,7 +93,7 @@ add_wired_device (const char *method, const char *ifname, char **out_path) return TRUE; } -/*******************************************************************/ +/*****************************************************************************/ typedef struct { GMainLoop *loop; @@ -197,7 +197,7 @@ test_device_added (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ static const char *expected_bssid = "66:55:44:33:22:11"; @@ -420,7 +420,7 @@ test_wifi_ap_added_removed (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ static const char *expected_nsp_name = "Clear"; @@ -643,7 +643,7 @@ test_wimax_nsp_added_removed (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ typedef struct { GMainLoop *loop; @@ -873,7 +873,7 @@ test_client_manager_running (void) g_object_unref (client2); } -/*******************************************************************/ +/*****************************************************************************/ static GPtrArray * _slist_to_array (GPtrArray **connections, GSList *list) @@ -1121,7 +1121,7 @@ test_connection_invalid (void) #undef ASSERT_IDX } -/*******************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index 9213aa720e..57bc4faa61 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -41,7 +41,7 @@ static NMRemoteSettings *settings = NULL; DBusGConnection *bus = NULL; NMRemoteConnection *remote = NULL; -/*******************************************************************/ +/*****************************************************************************/ static void add_cb (NMRemoteSettings *s, @@ -105,7 +105,7 @@ test_add_connection (void) NM_SETTING_COMPARE_FLAG_EXACT) == TRUE); } -/*******************************************************************/ +/*****************************************************************************/ static void set_visible_cb (DBusGProxy *proxy, @@ -192,7 +192,7 @@ test_make_invisible (void) g_object_unref (proxy); } -/*******************************************************************/ +/*****************************************************************************/ static void vis_new_connection_cb (NMRemoteSettings *foo, @@ -262,7 +262,7 @@ test_make_visible (void) g_object_unref (proxy); } -/*******************************************************************/ +/*****************************************************************************/ static void deleted_cb (DBusGProxy *proxy, @@ -336,7 +336,7 @@ test_remove_connection (void) g_object_unref (proxy); } -/*******************************************************************/ +/*****************************************************************************/ static GMainLoop *loop; @@ -418,7 +418,7 @@ test_service_running (void) g_object_unref (settings2); } -/*******************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 51c480284f..b929fdcd1a 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -124,7 +124,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error); -/*************************************************************/ +/*****************************************************************************/ /** * nm_connection_lookup_setting_type: @@ -1638,7 +1638,7 @@ nm_connection_get_virtual_device_description (NMConnection *connection) return g_strdup_printf ("%s (%s)", display_type, iface); } -/*************************************************************/ +/*****************************************************************************/ /** * nm_connection_get_setting_802_1x: @@ -2064,7 +2064,7 @@ nm_connection_get_setting_vlan (NMConnection *connection) return (NMSettingVlan *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VLAN); } -/*************************************************************/ +/*****************************************************************************/ static void nm_connection_init (NMConnection *connection) diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 0bb32b7fed..7021e108fc 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -36,7 +36,7 @@ struct _NMParamSpecSpecialized { #include "nm-dbus-glib-types.h" -/***********************************************************/ +/*****************************************************************************/ /* _gvalues_compare */ static gint _gvalues_compare (const GValue *value1, const GValue *value2); @@ -561,7 +561,7 @@ _gvalues_compare (const GValue *value1, const GValue *value2) return ret; } -/***********************************************************/ +/*****************************************************************************/ static void param_specialized_init (GParamSpec *pspec) @@ -638,7 +638,7 @@ _nm_param_spec_specialized (const char *name, return G_PARAM_SPEC (pspec); } -/***********************************************************/ +/*****************************************************************************/ /* Tests */ #if 0 diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index 3d11e73cfa..3d671ae376 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -84,7 +84,7 @@ enum { LAST_PROP }; -/**************************************************************************/ +/*****************************************************************************/ /** * nm_setting_bridge_port_get_priority: @@ -134,7 +134,7 @@ nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *setting) return NM_SETTING_BRIDGE_PORT_GET_PRIVATE (setting)->hairpin_mode; } -/**************************************************************************/ +/*****************************************************************************/ #define BR_MAX_PORT_PRIORITY 63 #define BR_DEF_PRIORITY 32 @@ -174,7 +174,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return TRUE; } -/**************************************************************************/ +/*****************************************************************************/ /** * nm_setting_bridge_port_new: diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index 16c858dc5c..e6fe2fe4bf 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -112,7 +112,7 @@ enum { LAST_PROP }; -/***********************************************************************/ +/*****************************************************************************/ #define PERM_USER_PREFIX "user:" @@ -193,7 +193,7 @@ permission_free (Permission *p) g_slice_free (Permission, p); } -/***********************************************************************/ +/*****************************************************************************/ /** * nm_setting_connection_new: diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index 7888a71100..f5c3ab0be4 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -578,7 +578,7 @@ nm_setting_dcb_set_priority_traffic_class (NMSettingDcb *setting, } } -/******************************************************************/ +/*****************************************************************************/ #define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \ NM_SETTING_DCB_FLAG_ADVERTISE | \ @@ -796,7 +796,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static void nm_setting_dcb_init (NMSettingDcb *setting) diff --git a/libnm-util/nm-setting-generic.c b/libnm-util/nm-setting-generic.c index 39134e8bd2..573be86a5b 100644 --- a/libnm-util/nm-setting-generic.c +++ b/libnm-util/nm-setting-generic.c @@ -71,7 +71,7 @@ typedef struct { int dummy; } NMSettingGenericPrivate; -/**************************************************************************/ +/*****************************************************************************/ /** * nm_setting_generic_new: diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index ac1645883f..9ad93ac16c 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -1306,7 +1306,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) G_PARAM_STATIC_STRINGS)); } -/********************************************************************/ +/*****************************************************************************/ struct NMIP6Address { guint32 refcount; @@ -1521,7 +1521,7 @@ nm_ip6_address_set_gateway (NMIP6Address *address, const struct in6_addr *gatewa memcpy (&address->gateway, gateway, sizeof (struct in6_addr)); } -/********************************************************************/ +/*****************************************************************************/ struct NMIP6Route { guint32 refcount; diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 32ad9394f1..3437d69772 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -515,7 +515,7 @@ nm_setting_vlan_clear_priorities (NMSettingVlan *setting, NMVlanPriorityMap map) set_map (setting, map, NULL); } -/*********************************************************************/ +/*****************************************************************************/ static void nm_setting_vlan_init (NMSettingVlan *setting) diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index c0d82b4263..53e8f34384 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -82,7 +82,7 @@ enum { PROP_LAST }; -/*************************************************************/ +/*****************************************************************************/ static GHashTable *registered_settings = NULL; static GHashTable *registered_settings_by_type = NULL; @@ -124,7 +124,7 @@ _ensure_registered_constructor (void) } \ } G_STMT_END -/*************************************************************/ +/*****************************************************************************/ /* * _nm_register_setting: @@ -286,7 +286,7 @@ _nm_setting_compare_priority (gconstpointer a, gconstpointer b) return 1; } -/*************************************************************/ +/*****************************************************************************/ static void destroy_gvalue (gpointer data) diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index f22b4f74b8..fcb6bfd4e5 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -1730,7 +1730,7 @@ nm_utils_file_is_pkcs12 (const char *filename) return crypto_is_pkcs12_file (filename, NULL); } -/**********************************************************************************************/ +/*****************************************************************************/ /** * nm_utils_file_search_in_paths: @@ -1804,7 +1804,7 @@ NOT_FOUND: return NULL; } -/**********************************************************************************************/ +/*****************************************************************************/ /* Band, channel/frequency stuff for wireless */ struct cf_pair { @@ -2577,7 +2577,7 @@ nm_utils_check_virtual_device_compatibility (GType virtual_type, GType other_typ } } -/***********************************************************/ +/*****************************************************************************/ /* Unused prototypes to make the compiler happy */ gconstpointer nm_utils_get_private (void); diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 8373ae1197..daa948941d 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -2440,7 +2440,7 @@ test_libnm_linking (void) } #endif /* __SANITIZE_ADDRESS__ */ -/******************************************************************************/ +/*****************************************************************************/ static void _test_uuid (const char *expected_uuid, const char *str) @@ -2480,7 +2480,7 @@ test_nm_utils_uuid_generate_from_string (void) g_test_assert_expected_messages (); } -/******************************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index d1dd1c3fdd..67b8550603 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -381,7 +381,7 @@ nm_access_point_filter_connections (NMAccessPoint *ap, const GPtrArray *connecti return filtered; } -/************************************************************/ +/*****************************************************************************/ static void nm_access_point_init (NMAccessPoint *ap) diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 64c0d9de1d..17dc41c6d7 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -97,7 +97,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -/**********************************************************************/ +/*****************************************************************************/ /** * nm_client_error_quark: @@ -116,7 +116,7 @@ nm_client_error_quark (void) return quark; } -/**********************************************************************/ +/*****************************************************************************/ static void nm_client_init (NMClient *client) @@ -698,9 +698,9 @@ nm_client_save_hostname_finish (NMClient *client, return g_simple_async_result_get_op_res_gboolean (simple); } -/****************************************************************/ +/*****************************************************************************/ /* Devices */ -/****************************************************************/ +/*****************************************************************************/ /** * nm_client_get_devices: @@ -787,9 +787,9 @@ nm_client_get_device_by_iface (NMClient *client, const char *iface) return nm_manager_get_device_by_iface (NM_CLIENT_GET_PRIVATE (client)->manager, iface); } -/****************************************************************/ +/*****************************************************************************/ /* Active Connections */ -/****************************************************************/ +/*****************************************************************************/ /** * nm_client_get_active_connections: @@ -1180,9 +1180,9 @@ nm_client_deactivate_connection_finish (NMClient *client, return g_simple_async_result_get_op_res_gboolean (simple); } -/****************************************************************/ +/*****************************************************************************/ /* Connections */ -/****************************************************************/ +/*****************************************************************************/ /** * nm_client_get_connections: @@ -1602,7 +1602,7 @@ nm_client_reload_connections_finish (NMClient *client, return g_simple_async_result_get_op_res_gboolean (simple); } -/****************************************************************/ +/*****************************************************************************/ /** * nm_client_new: diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c index 7608ff3916..6c66f717f8 100644 --- a/libnm/nm-device-adsl.c +++ b/libnm/nm-device-adsl.c @@ -84,7 +84,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_ADSL; } -/******************************************************************/ +/*****************************************************************************/ static void nm_device_adsl_init (NMDeviceAdsl *device) diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 483d9d009b..e5977c6664 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -130,7 +130,7 @@ get_hw_address (NMDevice *device) return nm_device_bond_get_hw_address (NM_DEVICE_BOND (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_bond_init (NMDeviceBond *device) diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index c6bf135997..83ad963410 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -130,7 +130,7 @@ get_hw_address (NMDevice *device) return nm_device_bridge_get_hw_address (NM_DEVICE_BRIDGE (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_bridge_init (NMDeviceBridge *device) diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c index dc28ad89f4..2c039d941e 100644 --- a/libnm/nm-device-bt.c +++ b/libnm/nm-device-bt.c @@ -178,7 +178,7 @@ get_hw_address (NMDevice *device) return nm_device_bt_get_hw_address (NM_DEVICE_BT (device)); } -/************************************************************/ +/*****************************************************************************/ static void nm_device_bt_init (NMDeviceBt *device) diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c index 825ed7b392..15ca0257e6 100644 --- a/libnm/nm-device-ethernet.c +++ b/libnm/nm-device-ethernet.c @@ -277,7 +277,7 @@ get_hw_address (NMDevice *device) return nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_ethernet_init (NMDeviceEthernet *device) diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c index 069ca0eafa..9dd1c945ec 100644 --- a/libnm/nm-device-generic.c +++ b/libnm/nm-device-generic.c @@ -62,7 +62,7 @@ nm_device_generic_get_hw_address (NMDeviceGeneric *device) return NM_DEVICE_GENERIC_GET_PRIVATE (device)->hw_address; } -/***********************************************************/ +/*****************************************************************************/ static const char * get_type_description (NMDevice *device) @@ -108,7 +108,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_GENERIC; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_generic_init (NMDeviceGeneric *device) diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c index 6770b1c53e..0f92f8304b 100644 --- a/libnm/nm-device-infiniband.c +++ b/libnm/nm-device-infiniband.c @@ -127,7 +127,7 @@ get_hw_address (NMDevice *device) return nm_device_infiniband_get_hw_address (NM_DEVICE_INFINIBAND (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_infiniband_init (NMDeviceInfiniband *device) diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c index f5b3cad6a3..6410c48c4d 100644 --- a/libnm/nm-device-ip-tunnel.c +++ b/libnm/nm-device-ip-tunnel.c @@ -264,7 +264,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_IP_TUNNEL; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_ip_tunnel_init (NMDeviceIPTunnel *device) diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c index 825c9197c1..610bdc35f2 100644 --- a/libnm/nm-device-macvlan.c +++ b/libnm/nm-device-macvlan.c @@ -181,7 +181,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_MACVLAN; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_macvlan_init (NMDeviceMacvlan *device) diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c index d442dc0342..ae011812f2 100644 --- a/libnm/nm-device-modem.c +++ b/libnm/nm-device-modem.c @@ -153,7 +153,7 @@ get_setting_type (NMDevice *device) return G_TYPE_INVALID; } -/*******************************************************************/ +/*****************************************************************************/ static void nm_device_modem_init (NMDeviceModem *device) diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c index 984ea4e42d..a11050f5b4 100644 --- a/libnm/nm-device-olpc-mesh.c +++ b/libnm/nm-device-olpc-mesh.c @@ -125,7 +125,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_OLPC_MESH; } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_olpc_mesh_init (NMDeviceOlpcMesh *device) diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index 3955e10561..8179bd52f4 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -151,7 +151,7 @@ get_setting_type (NMDevice *device) return NM_TYPE_SETTING_TEAM; } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_team_init (NMDeviceTeam *device) diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c index b227f5b13e..e4e412f8fe 100644 --- a/libnm/nm-device-tun.c +++ b/libnm/nm-device-tun.c @@ -234,7 +234,7 @@ get_hw_address (NMDevice *device) return nm_device_tun_get_hw_address (NM_DEVICE_TUN (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_tun_init (NMDeviceTun *device) diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c index 843dda02df..7083b24484 100644 --- a/libnm/nm-device-vlan.c +++ b/libnm/nm-device-vlan.c @@ -164,7 +164,7 @@ get_hw_address (NMDevice *device) return nm_device_vlan_get_hw_address (NM_DEVICE_VLAN (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_vlan_init (NMDeviceVlan *device) diff --git a/libnm/nm-device-vxlan.c b/libnm/nm-device-vxlan.c index 335498ee4a..86b5fca8e7 100644 --- a/libnm/nm-device-vxlan.c +++ b/libnm/nm-device-vxlan.c @@ -410,7 +410,7 @@ get_hw_address (NMDevice *device) return nm_device_vxlan_get_hw_address (NM_DEVICE_VXLAN (device)); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_vxlan_init (NMDeviceVxlan *device) diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 3fde324c05..790ddf4ca6 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -656,7 +656,7 @@ get_hw_address (NMDevice *device) return nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device)); } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_wifi_init (NMDeviceWifi *device) diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c index e26efedbae..e14925f778 100644 --- a/libnm/nm-device-wimax.c +++ b/libnm/nm-device-wimax.c @@ -350,7 +350,7 @@ get_hw_address (NMDevice *device) return nm_device_wimax_get_hw_address (NM_DEVICE_WIMAX (device)); } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_wimax_init (NMDeviceWimax *device) diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index c3d0c51db0..d9d21b823d 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -128,7 +128,7 @@ static void nm_running_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data); -/**********************************************************************/ +/*****************************************************************************/ static void nm_manager_init (NMManager *manager) @@ -657,9 +657,9 @@ nm_manager_check_connectivity_finish (NMManager *manager, return (NMConnectivityState) g_simple_async_result_get_op_res_gssize (simple); } -/****************************************************************/ +/*****************************************************************************/ /* Devices */ -/****************************************************************/ +/*****************************************************************************/ const GPtrArray * nm_manager_get_devices (NMManager *manager) @@ -721,9 +721,9 @@ nm_manager_get_device_by_iface (NMManager *manager, const char *iface) return device; } -/****************************************************************/ +/*****************************************************************************/ /* Active Connections */ -/****************************************************************/ +/*****************************************************************************/ const GPtrArray * nm_manager_get_active_connections (NMManager *manager) @@ -1184,7 +1184,7 @@ nm_manager_deactivate_connection_finish (NMManager *manager, return g_simple_async_result_get_op_res_gboolean (simple); } -/****************************************************************/ +/*****************************************************************************/ static void free_devices (NMManager *manager, gboolean in_dispose) @@ -1320,7 +1320,7 @@ nm_running_changed_cb (GObject *object, } } -/****************************************************************/ +/*****************************************************************************/ static void constructed (GObject *object) diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 337ca69862..4c417c3202 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -1509,7 +1509,7 @@ _nm_object_get_nm_running (NMObject *self) return NM_OBJECT_GET_PRIVATE (self)->nm_running; } -/**************************************************************/ +/*****************************************************************************/ static void on_name_owner_changed (GObject *proxy, @@ -1588,7 +1588,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) return _nm_object_reload_properties (self, error); } -/**************************************************************/ +/*****************************************************************************/ typedef struct { NMObject *object; @@ -1724,7 +1724,7 @@ init_finish (GAsyncInitable *initable, GAsyncResult *result, GError **error) return TRUE; } -/**************************************************************/ +/*****************************************************************************/ static void nm_object_initable_iface_init (GInitableIface *iface) diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index eb2874a049..6ad5e5f506 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -65,7 +65,7 @@ typedef struct { #define NM_REMOTE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionPrivate)) -/****************************************************************/ +/*****************************************************************************/ /** * nm_remote_connection_commit_changes: @@ -557,7 +557,7 @@ nm_remote_connection_get_visible (NMRemoteConnection *connection) return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->visible; } -/****************************************************************/ +/*****************************************************************************/ static void replace_settings (NMRemoteConnection *self, GVariant *new_settings) @@ -615,7 +615,7 @@ updated_cb (NMDBusSettingsConnection *proxy, gpointer user_data) g_object_ref (self)); } -/****************************************************************/ +/*****************************************************************************/ static void init_dbus (NMObject *object) diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index b04f4f2ac8..fa3a0f09f5 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -73,7 +73,7 @@ enum { }; static guint signals[LAST_SIGNAL] = { 0 }; -/**********************************************************************/ +/*****************************************************************************/ typedef struct { NMRemoteSettings *self; @@ -660,7 +660,7 @@ nm_running_changed (GObject *object, g_object_thaw_notify (object); } -/****************************************************************/ +/*****************************************************************************/ static void nm_remote_settings_init (NMRemoteSettings *self) diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 02a3f685ca..1a078183ac 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -70,7 +70,7 @@ enum { LAST_PROP }; -/*************************************************************/ +/*****************************************************************************/ static void _internal_unregister (NMSecretAgentOld *self) @@ -472,7 +472,7 @@ impl_secret_agent_old_delete_secrets (NMSecretAgentOld *self, g_object_unref (connection); } -/**************************************************************/ +/*****************************************************************************/ static gboolean check_nm_running (NMSecretAgentOld *self, GError **error) @@ -493,7 +493,7 @@ check_nm_running (NMSecretAgentOld *self, GError **error) return FALSE; } -/**************************************************************/ +/*****************************************************************************/ /** * nm_secret_agent_old_register: @@ -878,7 +878,7 @@ nm_secret_agent_old_get_registered (NMSecretAgentOld *self) return NM_SECRET_AGENT_OLD_GET_PRIVATE (self)->registered; } -/**************************************************************/ +/*****************************************************************************/ /** * nm_secret_agent_old_get_secrets: @@ -984,7 +984,7 @@ nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self, user_data); } -/**************************************************************/ +/*****************************************************************************/ static gboolean validate_identifier (const char *identifier) diff --git a/libnm/nm-vpn-editor.h b/libnm/nm-vpn-editor.h index 2ee34525d8..d450bbd6ad 100644 --- a/libnm/nm-vpn-editor.h +++ b/libnm/nm-vpn-editor.h @@ -34,9 +34,9 @@ G_BEGIN_DECLS -/**************************************************/ +/*****************************************************************************/ /* Editor interface */ -/**************************************************/ +/*****************************************************************************/ #define NM_TYPE_VPN_EDITOR (nm_vpn_editor_get_type ()) #define NM_VPN_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_EDITOR, NMVpnEditor)) diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index 634e61a232..cfaefdf264 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -534,7 +534,7 @@ impl_vpn_plugin_old_connect_interactive (NMVpnPluginOld *plugin, _connect_generic (plugin, context, connection, details); } -/***************************************************************/ +/*****************************************************************************/ static void impl_vpn_plugin_old_need_secrets (NMVpnPluginOld *plugin, @@ -681,7 +681,7 @@ nm_vpn_plugin_old_secrets_required (NMVpnPluginOld *plugin, g_signal_emit (plugin, signals[SECRETS_REQUIRED], 0, message, hints); } -/***************************************************************/ +/*****************************************************************************/ #define DATA_KEY_TAG "DATA_KEY=" #define DATA_VAL_TAG "DATA_VAL=" @@ -847,7 +847,7 @@ nm_vpn_plugin_old_get_secret_flags (GHashTable *data, return success; } -/***************************************************************/ +/*****************************************************************************/ static void impl_vpn_plugin_old_disconnect (NMVpnPluginOld *plugin, @@ -902,7 +902,7 @@ impl_vpn_plugin_old_set_failure (NMVpnPluginOld *plugin, g_dbus_method_invocation_return_value (context, NULL); } -/*********************************************************************/ +/*****************************************************************************/ static void sigterm_handler (int signum) @@ -924,7 +924,7 @@ setup_unix_signal_handler (void) sigaction (SIGTERM, &action, NULL); } -/*********************************************************************/ +/*****************************************************************************/ static void one_plugin_destroyed (gpointer data, diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 6431629669..8b781f08e3 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -554,7 +554,7 @@ impl_vpn_service_plugin_connect_interactive (NMVpnServicePlugin *plugin, _connect_generic (plugin, context, connection, details); } -/***************************************************************/ +/*****************************************************************************/ static void impl_vpn_service_plugin_need_secrets (NMVpnServicePlugin *plugin, @@ -702,7 +702,7 @@ nm_vpn_service_plugin_secrets_required (NMVpnServicePlugin *plugin, nmdbus_vpn_plugin_emit_secrets_required (priv->dbus_vpn_service_plugin, message, hints); } -/***************************************************************/ +/*****************************************************************************/ #define DATA_KEY_TAG "DATA_KEY=" #define DATA_VAL_TAG "DATA_VAL=" @@ -868,7 +868,7 @@ nm_vpn_service_plugin_get_secret_flags (GHashTable *data, return success; } -/***************************************************************/ +/*****************************************************************************/ static void impl_vpn_service_plugin_disconnect (NMVpnServicePlugin *plugin, @@ -923,7 +923,7 @@ impl_vpn_service_plugin_set_failure (NMVpnServicePlugin *plugin, g_dbus_method_invocation_return_value (context, NULL); } -/*********************************************************************/ +/*****************************************************************************/ static void sigterm_handler (int signum) @@ -945,7 +945,7 @@ setup_unix_signal_handler (void) sigaction (SIGTERM, &action, NULL); } -/*********************************************************************/ +/*****************************************************************************/ static void one_plugin_destroyed (gpointer data, diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c index d544b0d47f..c15fddd900 100644 --- a/libnm/nm-wimax-nsp.c +++ b/libnm/nm-wimax-nsp.c @@ -172,7 +172,7 @@ nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp, const GPtrArray *connections) return filtered; } -/************************************************************/ +/*****************************************************************************/ static void nm_wimax_nsp_init (NMWimaxNsp *nsp) diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index 3a7c4d5dde..a45d47c2a7 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -29,7 +29,7 @@ static GMainLoop *loop = NULL; static NMTstcServiceInfo *sinfo; -/*******************************************************************/ +/*****************************************************************************/ static gboolean loop_quit (gpointer user_data) @@ -38,7 +38,7 @@ loop_quit (gpointer user_data) return G_SOURCE_REMOVE; } -/*******************************************************************/ +/*****************************************************************************/ static void devices_notify_cb (NMClient *c, @@ -107,7 +107,7 @@ test_device_added (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ typedef enum { SIGNAL_FIRST = 0x01, @@ -206,7 +206,7 @@ test_device_added_signal_after_init (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ static const char *expected_bssid = "66:55:44:33:22:11"; @@ -405,7 +405,7 @@ test_wifi_ap_added_removed (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ static const char *expected_nsp_name = "Clear"; @@ -604,7 +604,7 @@ test_wimax_nsp_added_removed (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ typedef struct { GMainLoop *loop; @@ -1228,7 +1228,7 @@ test_device_connection_compatibility (void) g_clear_pointer (&sinfo, nmtstc_service_cleanup); } -/*******************************************************************/ +/*****************************************************************************/ static gboolean _test_connection_invalid_find_connections (gpointer element, gpointer needle, gpointer user_data) @@ -1568,7 +1568,7 @@ test_connection_invalid (void) #undef ASSERT_IDX } -/*******************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 8f59656d75..fda943c804 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -31,7 +31,7 @@ static NMClient *client = NULL; GDBusConnection *bus = NULL; NMRemoteConnection *remote = NULL; -/*******************************************************************/ +/*****************************************************************************/ static void add_cb (GObject *s, @@ -87,7 +87,7 @@ test_add_connection (void) g_object_unref (connection); } -/*******************************************************************/ +/*****************************************************************************/ static void set_visible_cb (GObject *proxy, @@ -194,7 +194,7 @@ test_make_invisible (void) g_object_unref (proxy); } -/*******************************************************************/ +/*****************************************************************************/ static void vis_new_connection_cb (NMClient *foo, @@ -271,7 +271,7 @@ test_make_visible (void) g_object_unref (proxy); } -/*******************************************************************/ +/*****************************************************************************/ static void deleted_cb (GObject *proxy, @@ -354,7 +354,7 @@ test_remove_connection (void) g_object_unref (proxy); } -/*******************************************************************/ +/*****************************************************************************/ #define TEST_ADD_REMOVE_ID "add-remove-test-connection" @@ -413,7 +413,7 @@ test_add_remove_connection (void) g_object_unref (connection); } -/*******************************************************************/ +/*****************************************************************************/ static void add_bad_cb (GObject *s, @@ -456,7 +456,7 @@ test_add_bad_connection (void) g_assert (remote == NULL); } -/*******************************************************************/ +/*****************************************************************************/ static void save_hostname_cb (GObject *s, @@ -495,7 +495,7 @@ test_save_hostname (void) g_assert (remote == NULL); } -/*******************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 9756186681..e4ebe3e0e9 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -28,7 +28,7 @@ #include "nm-test-libnm-utils.h" -/*******************************************************************/ +/*****************************************************************************/ enum { SECRET_REQUESTED, @@ -176,7 +176,7 @@ test_secret_agent_new (void) return agent; } -/*******************************************************************/ +/*****************************************************************************/ typedef struct { NMTstcServiceInfo *sinfo; @@ -341,7 +341,7 @@ test_cleanup (TestSecretAgentData *sadata, gconstpointer test_data) g_free (sadata->con_id); } -/*******************************************************************/ +/*****************************************************************************/ static void connection_activated_none_cb (GObject *c, @@ -371,7 +371,7 @@ test_secret_agent_none (TestSecretAgentData *sadata, gconstpointer test_data) g_main_loop_run (sadata->loop); } -/*******************************************************************/ +/*****************************************************************************/ static char * secrets_requested_no_secrets_cb (TestSecretAgent *agent, @@ -422,7 +422,7 @@ test_secret_agent_no_secrets (TestSecretAgentData *sadata, gconstpointer test_da g_assert_cmpint (sadata->secrets_requested, ==, 1); } -/*******************************************************************/ +/*****************************************************************************/ static void connection_activated_cancel_cb (GObject *c, @@ -473,7 +473,7 @@ test_secret_agent_cancel (TestSecretAgentData *sadata, gconstpointer test_data) g_assert_cmpint (sadata->secrets_requested, ==, 1); } -/*******************************************************************/ +/*****************************************************************************/ static void connection_activated_good_cb (GObject *c, @@ -618,7 +618,7 @@ test_secret_agent_auto_register (void) g_main_loop_unref (loop); } -/*******************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/shared/nm-common-macros.h b/shared/nm-common-macros.h index 6e0769cca4..39acf56f7a 100644 --- a/shared/nm-common-macros.h +++ b/shared/nm-common-macros.h @@ -22,7 +22,7 @@ #ifndef __NM_COMMON_MACROS_H__ #define __NM_COMMON_MACROS_H__ -/******************************************************************************/ +/*****************************************************************************/ #define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK "org.freedesktop.NetworkManager.enable-disable-network" #define NM_AUTH_PERMISSION_SLEEP_WAKE "org.freedesktop.NetworkManager.sleep-wake" @@ -55,6 +55,6 @@ NM_CLONED_MAC_IS_SPECIAL (const char *str) NM_CLONED_MAC_STABLE); } -/******************************************************************************/ +/*****************************************************************************/ #endif /* __NM_COMMON_MACROS_H__ */ diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h index d116fb873a..1a6e1f9212 100644 --- a/shared/nm-utils/nm-macros-internal.h +++ b/shared/nm-utils/nm-macros-internal.h @@ -26,7 +26,7 @@ #include "nm-glib.h" -/********************************************************/ +/*****************************************************************************/ #define _nm_packed __attribute__ ((packed)) #define _nm_unused __attribute__ ((unused)) @@ -59,7 +59,7 @@ _nm_auto_free_gstring_impl (GString **str) } #define nm_auto_free_gstring nm_auto(_nm_auto_free_gstring_impl) -/********************************************************/ +/*****************************************************************************/ /* http://stackoverflow.com/a/11172679 */ #define _NM_UTILS_MACRO_FIRST(...) __NM_UTILS_MACRO_FIRST_HELPER(__VA_ARGS__, throwaway) @@ -78,7 +78,7 @@ _nm_auto_free_gstring_impl (GString **str) TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway) #define __NM_UTILS_MACRO_REST_SELECT_20TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, ...) a20 -/********************************************************/ +/*****************************************************************************/ /* http://stackoverflow.com/a/2124385/354393 */ @@ -103,7 +103,7 @@ _nm_auto_free_gstring_impl (GString **str) 19,18,17,16,15,14,13,12,11,10, \ 9,8,7,6,5,4,3,2,1,0 -/********************************************************/ +/*****************************************************************************/ #if defined (__GNUC__) #define _NM_PRAGMA_WARNING_DO(warning) G_STRINGIFY(GCC diagnostic ignored warning) @@ -139,7 +139,7 @@ _nm_auto_free_gstring_impl (GString **str) #define NM_PRAGMA_WARNING_REENABLE #endif -/********************************************************/ +/*****************************************************************************/ /** * NM_G_ERROR_MSG: @@ -159,7 +159,7 @@ NM_G_ERROR_MSG (GError *error) return error ? (error->message ? : "(null)") : "(no-error)"; \ } -/********************************************************/ +/*****************************************************************************/ /* macro to return strlen() of a compile time string. */ #define NM_STRLEN(str) ( sizeof ("" str) - 1 ) @@ -178,7 +178,7 @@ NM_G_ERROR_MSG (GError *error) } \ } G_STMT_END -/********************************************************/ +/*****************************************************************************/ #define _NM_IN_SET_EVAL_1( op, _x, y) (_x == (y)) #define _NM_IN_SET_EVAL_2( op, _x, y, ...) (_x == (y)) op _NM_IN_SET_EVAL_1 (op, _x, __VA_ARGS__) @@ -214,7 +214,7 @@ NM_G_ERROR_MSG (GError *error) * side-effects. */ #define NM_IN_SET_SE(x, ...) _NM_IN_SET_EVAL_N(|, x, NM_NARG (__VA_ARGS__), __VA_ARGS__) -/********************************************************/ +/*****************************************************************************/ static inline gboolean _NM_IN_STRSET_streq (const char *x, const char *s) diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h index cfa8f994f7..f77fb0e353 100644 --- a/shared/nm-utils/nm-shared-utils.h +++ b/shared/nm-utils/nm-shared-utils.h @@ -22,14 +22,14 @@ #ifndef __NM_SHARED_UTILS_H__ #define __NM_SHARED_UTILS_H__ -/******************************************************************************/ +/*****************************************************************************/ gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback); gint _nm_utils_ascii_str_to_bool (const char *str, gint default_value); -/******************************************************************************/ +/*****************************************************************************/ /** * NMUtilsError: @@ -54,13 +54,13 @@ void nm_utils_error_set_cancelled (GError **error, gboolean nm_utils_error_is_cancelled (GError *error, gboolean consider_is_disposing); -/******************************************************************************/ +/*****************************************************************************/ gboolean nm_g_object_set_property (GObject *object, const gchar *property_name, const GValue *value, GError **error); -/******************************************************************************/ +/*****************************************************************************/ #endif /* __NM_SHARED_UTILS_H__ */ diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index dba41c4ba9..64604e38f1 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -106,12 +106,12 @@ #include "nm-utils.h" -/*******************************************************************************/ +/*****************************************************************************/ #define NMTST_G_RETURN_MSG_S(expr) "*: assertion '"NM_ASSERT_G_RETURN_EXPR(expr)"' failed" #define NMTST_G_RETURN_MSG(expr) NMTST_G_RETURN_MSG_S(#expr) -/*******************************************************************************/ +/*****************************************************************************/ /* general purpose functions that have no dependency on other nmtst functions */ @@ -168,7 +168,7 @@ g_assert (!(success)); \ } G_STMT_END -/*******************************************************************************/ +/*****************************************************************************/ struct __nmtst_internal { @@ -1123,7 +1123,7 @@ __nmtst_spawn_sync (const char *working_directory, char **standard_out, char **s return exit_status; } -/*******************************************************************************/ +/*****************************************************************************/ inline static char * nmtst_file_resolve_relative_path (const char *rel, const char *cwd) @@ -1156,7 +1156,7 @@ _nmtst_assert_resolve_relative_path_equals (const char *f1, const char *f2, cons } #define nmtst_assert_resolve_relative_path_equals(f1, f2) _nmtst_assert_resolve_relative_path_equals (f1, f2, __FILE__, __LINE__); -/*******************************************************************************/ +/*****************************************************************************/ #ifdef NM_SETTING_IP_CONFIG_H inline static void diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 7cfe03f1df..ad90fb7118 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -34,7 +34,7 @@ #include "nm-exported-object.h" #include "nm-auth-utils.h" -/******************************************************************************/ +/*****************************************************************************/ /** * nm_utils_get_shared_wifi_permission: @@ -65,7 +65,7 @@ nm_utils_get_shared_wifi_permission (NMConnection *connection) return NULL; } -/******************************************************************************/ +/*****************************************************************************/ static char * get_new_connection_name (const GSList *existing, @@ -774,7 +774,7 @@ nm_utils_match_connection (GSList *connections, return best_match; } -/******************************************************************************/ +/*****************************************************************************/ /** * nm_utils_g_value_set_object_path: @@ -830,4 +830,4 @@ nm_utils_g_value_set_object_path_array (GValue *value, g_value_take_boxed (value, paths); } -/******************************************************************************/ +/*****************************************************************************/ diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c index 6708575215..ab0f870218 100644 --- a/src/devices/adsl/nm-atm-manager.c +++ b/src/devices/adsl/nm-atm-manager.c @@ -44,7 +44,7 @@ static void device_factory_interface_init (NMDeviceFactoryInterface *factory_ifa G_DEFINE_TYPE_EXTENDED (NMAtmManager, nm_atm_manager, G_TYPE_OBJECT, 0, G_IMPLEMENT_INTERFACE (NM_TYPE_DEVICE_FACTORY, device_factory_interface_init)) -/**************************************************************************/ +/*****************************************************************************/ G_MODULE_EXPORT NMDeviceFactory * nm_device_factory_create (GError **error) @@ -52,7 +52,7 @@ nm_device_factory_create (GError **error) return (NMDeviceFactory *) g_object_new (NM_TYPE_ATM_MANAGER, NULL); } -/************************************************************************/ +/*****************************************************************************/ static gboolean dev_get_attrs (GUdevDevice *udev_device, @@ -223,7 +223,7 @@ NM_DEVICE_FACTORY_DECLARE_TYPES ( NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_ADSL_SETTING_NAME) ) -/*********************************************************************/ +/*****************************************************************************/ static void nm_atm_manager_init (NMAtmManager *self) diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index ebb7a319b4..b69528d097 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -57,7 +57,7 @@ enum { LAST_PROP }; -/**********************************************/ +/*****************************************************************************/ typedef struct { guint carrier_poll_id; @@ -74,7 +74,7 @@ typedef struct { guint nas_update_count; } NMDeviceAdslPrivate; -/**************************************************************/ +/*****************************************************************************/ static NMDeviceCapabilities get_generic_capabilities (NMDevice *dev) @@ -138,7 +138,7 @@ complete_connection (NMDevice *device, return TRUE; } -/**************************************************************/ +/*****************************************************************************/ static gboolean br2684_assign_vcc (NMDeviceAdsl *self, NMSettingAdsl *s_adsl) @@ -526,7 +526,7 @@ deactivate (NMDevice *device) adsl_cleanup (NM_DEVICE_ADSL (device)); } -/**************************************************************/ +/*****************************************************************************/ static gboolean carrier_update_cb (gpointer user_data) @@ -545,7 +545,7 @@ carrier_update_cb (gpointer user_data) return TRUE; } -/**************************************************************/ +/*****************************************************************************/ NMDevice * nm_device_adsl_new (const char *udi, diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 3463da6be8..0e406bcc38 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -107,7 +107,7 @@ static gboolean connection_compatible (NMBluezDevice *self, NMConnection *connec #define VARIANT_IS_OF_TYPE_OBJECT_PATH(v) ((v) != NULL && ( g_variant_is_of_type ((v), G_VARIANT_TYPE_OBJECT_PATH) )) #define VARIANT_IS_OF_TYPE_STRING_ARRAY(v) ((v) != NULL && ( g_variant_is_of_type ((v), G_VARIANT_TYPE_STRING_ARRAY) )) -/***********************************************************/ +/*****************************************************************************/ const char * nm_bluez_device_get_path (NMBluezDevice *self) @@ -307,7 +307,7 @@ check_emit_usable_schedule (NMBluezDevice *self) priv->check_emit_usable_id = g_idle_add ((GSourceFunc) check_emit_usable, self); } -/********************************************************************/ +/*****************************************************************************/ static gboolean connection_compatible (NMBluezDevice *self, NMConnection *connection) @@ -417,7 +417,7 @@ load_connections (NMBluezDevice *self) check_emit_usable (self); } -/***********************************************************/ +/*****************************************************************************/ static void bluez_disconnect_cb (GDBusConnection *dbus_connection, @@ -634,7 +634,7 @@ nm_bluez_device_connect_finish (NMBluezDevice *self, return device; } -/***********************************************************/ +/*****************************************************************************/ static void set_adapter_address (NMBluezDevice *self, const char *address) @@ -1027,7 +1027,7 @@ on_bus_acquired (GObject *object, GAsyncResult *res, NMBluezDevice *self) g_object_unref (self); } -/********************************************************************/ +/*****************************************************************************/ NMBluezDevice * nm_bluez_device_new (const char *path, diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index 0d2e302cfc..78d907157c 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -73,7 +73,7 @@ G_DEFINE_TYPE_EXTENDED (NMBluezManager, nm_bluez_manager, G_TYPE_OBJECT, 0, static void check_bluez_and_try_setup (NMBluezManager *self); -/**************************************************************************/ +/*****************************************************************************/ G_MODULE_EXPORT NMDeviceFactory * nm_device_factory_create (GError **error) @@ -81,7 +81,7 @@ nm_device_factory_create (GError **error) return (NMDeviceFactory *) g_object_new (NM_TYPE_BLUEZ_MANAGER, NULL); } -/************************************************************************/ +/*****************************************************************************/ struct AsyncData { NMBluezManager *self; @@ -387,7 +387,7 @@ NM_DEVICE_FACTORY_DECLARE_TYPES ( NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_BLUETOOTH_SETTING_NAME) ) -/*********************************************************************/ +/*****************************************************************************/ static void dispose (GObject *object) diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c index 2ef071a8bf..17feae1b1c 100644 --- a/src/devices/bluetooth/nm-bluez4-adapter.c +++ b/src/devices/bluetooth/nm-bluez4-adapter.c @@ -233,7 +233,7 @@ query_properties (NMBluez4Adapter *self) get_properties_cb, self); } -/***********************************************************/ +/*****************************************************************************/ NMBluez4Adapter * nm_bluez4_adapter_new (const char *path, NMSettings *settings) diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c index 36bc30e59c..1dc123d7d7 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.c +++ b/src/devices/bluetooth/nm-bluez4-manager.c @@ -222,7 +222,7 @@ name_owner_changed_cb (GObject *object, } } -/****************************************************************/ +/*****************************************************************************/ NMBluez4Manager * nm_bluez4_manager_new (NMSettings *settings) diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c index a014d0c124..63a814b057 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.c +++ b/src/devices/bluetooth/nm-bluez5-manager.c @@ -308,7 +308,7 @@ bluez_cleanup (NMBluez5Manager *self, gboolean do_signal) g_hash_table_remove_all (priv->devices); } -/****************************************************************/ +/*****************************************************************************/ NMBluez5Manager * nm_bluez5_manager_new (NMSettings *settings) diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index 3f17849b0a..b76aa5f6b8 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -45,7 +45,7 @@ typedef struct { int dummy; } NMDeviceBondPrivate; -/******************************************************************/ +/*****************************************************************************/ static NMDeviceCapabilities get_generic_capabilities (NMDevice *dev) @@ -115,7 +115,7 @@ complete_connection (NMDevice *device, return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static gboolean set_bond_attr (NMDevice *device, NMBondMode mode, const char *attr, const char *value) @@ -482,7 +482,7 @@ create_and_realize (NMDevice *device, return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static void nm_device_bond_init (NMDeviceBond * self) @@ -519,7 +519,7 @@ nm_device_bond_class_init (NMDeviceBondClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_BOND_FACTORY (nm_bond_factory_get_type ()) #define NM_BOND_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BOND_FACTORY, NMBondFactory)) diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index c35d286396..a58fb65b26 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -43,7 +43,7 @@ typedef struct { int dummy; } NMDeviceBridgePrivate; -/******************************************************************/ +/*****************************************************************************/ static NMDeviceCapabilities get_generic_capabilities (NMDevice *dev) @@ -121,7 +121,7 @@ complete_connection (NMDevice *device, return TRUE; } -/******************************************************************/ +/*****************************************************************************/ typedef struct { const char *name; @@ -411,7 +411,7 @@ create_and_realize (NMDevice *device, return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static void nm_device_bridge_init (NMDeviceBridge * self) @@ -447,7 +447,7 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_BRIDGE_FACTORY (nm_bridge_factory_get_type ()) #define NM_BRIDGE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BRIDGE_FACTORY, NMBridgeFactory)) diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index b213a0ccfc..f421bc67c3 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -955,7 +955,7 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas return ret; } -/****************************************************************/ +/*****************************************************************************/ static void dcb_state (NMDevice *device, gboolean timeout); @@ -1123,7 +1123,7 @@ dcb_carrier_changed (NMDevice *device, GParamSpec *pspec, gpointer unused) } } -/****************************************************************/ +/*****************************************************************************/ static gboolean wake_on_lan_enable (NMDevice *device) @@ -1164,7 +1164,7 @@ found: return nm_platform_ethtool_set_wake_on_lan (NM_PLATFORM_GET, nm_device_get_iface (device), wol, password); } -/****************************************************************/ +/*****************************************************************************/ static NMActStageReturn act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) @@ -1677,7 +1677,7 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_ETHERNET_FACTORY (nm_ethernet_factory_get_type ()) #define NM_ETHERNET_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ETHERNET_FACTORY, NMEthernetFactory)) diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index 7873756f9e..840328437c 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -213,7 +213,7 @@ nm_device_factory_get_connection_iface (NMDeviceFactory *factory, return ifname; } -/*******************************************************************/ +/*****************************************************************************/ static void nm_device_factory_default_init (NMDeviceFactoryInterface *factory_iface) @@ -234,7 +234,7 @@ nm_device_factory_default_init (NMDeviceFactoryInterface *factory_iface) G_TYPE_BOOLEAN, 1, G_TYPE_OBJECT); } -/*******************************************************************/ +/*****************************************************************************/ static GSList *internal_types = NULL; static GHashTable *factories_by_link = NULL; diff --git a/src/devices/nm-device-factory.h b/src/devices/nm-device-factory.h index 4a62468c88..0179e85534 100644 --- a/src/devices/nm-device-factory.h +++ b/src/devices/nm-device-factory.h @@ -48,7 +48,7 @@ NMDeviceFactory *nm_device_factory_create (GError **error); /* Should match nm_device_factory_create() */ typedef NMDeviceFactory * (*NMDeviceFactoryCreateFunc) (GError **error); -/********************************************************************/ +/*****************************************************************************/ #define NM_TYPE_DEVICE_FACTORY (nm_device_factory_get_type ()) #define NM_DEVICE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_FACTORY, NMDeviceFactory)) diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c index a0ce8a0494..2d86799bb9 100644 --- a/src/devices/nm-device-generic.c +++ b/src/devices/nm-device-generic.c @@ -108,7 +108,7 @@ update_connection (NMDevice *device, NMConnection *connection) NULL); } -/**************************************************************/ +/*****************************************************************************/ NMDevice * nm_device_generic_new (const NMPlatformLink *plink, gboolean nm_plugin_missing) diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index 17f50ba2c7..97940df752 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -52,7 +52,7 @@ enum { LAST_PROP }; -/*************************************************************/ +/*****************************************************************************/ static NMDeviceCapabilities get_generic_capabilities (NMDevice *dev) @@ -317,7 +317,7 @@ unrealize (NMDevice *device, GError **error) return TRUE; } -/*************************************************************/ +/*****************************************************************************/ static void nm_device_infiniband_init (NMDeviceInfiniband * self) @@ -389,7 +389,7 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_INFINIBAND_FACTORY (nm_infiniband_factory_get_type ()) #define NM_INFINIBAND_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_INFINIBAND_FACTORY, NMInfinibandFactory)) diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c index 785010ebfa..7ee46afb8f 100644 --- a/src/devices/nm-device-ip-tunnel.c +++ b/src/devices/nm-device-ip-tunnel.c @@ -79,7 +79,7 @@ enum { LAST_PROP }; -/**************************************************************/ +/*****************************************************************************/ static gboolean address_equal_pp (int family, const char *a, const char *b) @@ -583,7 +583,7 @@ tunnel_mode_to_link_type (NMIPTunnelMode tunnel_mode) } } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_ip_tunnel_init (NMDeviceIPTunnel *self) @@ -980,7 +980,7 @@ nm_device_ip_tunnel_class_init (NMDeviceIPTunnelClass *klass) NMDBUS_TYPE_DEVICE_IPTUNNEL_SKELETON, NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_IP_TUNNEL_FACTORY (nm_ip_tunnel_factory_get_type ()) #define NM_IP_TUNNEL_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP_TUNNEL_FACTORY, NMIPTunnelFactory)) diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index e9841a9d9c..e28d441bfb 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -112,7 +112,7 @@ platform_mode_to_string (guint mode) } } -/**************************************************************/ +/*****************************************************************************/ static void parent_state_changed (NMDevice *parent, @@ -258,7 +258,7 @@ create_and_realize (NMDevice *device, return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static NMDeviceCapabilities get_generic_capabilities (NMDevice *dev) @@ -267,7 +267,7 @@ get_generic_capabilities (NMDevice *dev) return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_IS_SOFTWARE; } -/******************************************************************/ +/*****************************************************************************/ static gboolean is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags) @@ -300,7 +300,7 @@ notify_new_device_added (NMDevice *device, NMDevice *new_device) nm_device_macvlan_set_parent (self, new_device); } -/**************************************************************/ +/*****************************************************************************/ static gboolean @@ -527,7 +527,7 @@ realize_start_notify (NMDevice *device, const NMPlatformLink *plink) update_properties (device); } -/******************************************************************/ +/*****************************************************************************/ static void nm_device_macvlan_init (NMDeviceMacvlan *self) @@ -649,7 +649,7 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_MACVLAN_FACTORY (nm_macvlan_factory_get_type ()) #define NM_MACVLAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MACVLAN_FACTORY, NMMacvlanFactory)) diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c index 1f42d06015..5b905244d1 100644 --- a/src/devices/nm-device-tun.c +++ b/src/devices/nm-device-tun.c @@ -345,7 +345,7 @@ unrealize_notify (NMDevice *device) g_free (properties); } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_tun_init (NMDeviceTun *self) @@ -480,7 +480,7 @@ nm_device_tun_class_init (NMDeviceTunClass *klass) } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_TUN_FACTORY (nm_tun_factory_get_type ()) #define NM_TUN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TUN_FACTORY, NMTunFactory)) diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c index 56923315c6..7f28bfbc8f 100644 --- a/src/devices/nm-device-veth.c +++ b/src/devices/nm-device-veth.c @@ -115,7 +115,7 @@ can_unmanaged_external_down (NMDevice *self) return FALSE; } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_veth_init (NMDeviceVeth *self) @@ -180,7 +180,7 @@ nm_device_veth_class_init (NMDeviceVethClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_VETH_FACTORY (nm_veth_factory_get_type ()) #define NM_VETH_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VETH_FACTORY, NMVethFactory)) diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index ad9d2486a8..deed16b674 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -62,7 +62,7 @@ enum { LAST_PROP }; -/******************************************************************/ +/*****************************************************************************/ static void parent_state_changed (NMDevice *parent, @@ -273,7 +273,7 @@ unrealize_notify (NMDevice *device) nm_device_vlan_set_parent (NM_DEVICE_VLAN (device), NULL); } -/******************************************************************/ +/*****************************************************************************/ static NMDeviceCapabilities get_generic_capabilities (NMDevice *dev) @@ -282,7 +282,7 @@ get_generic_capabilities (NMDevice *dev) return NM_DEVICE_CAP_CARRIER_DETECT | NM_DEVICE_CAP_IS_SOFTWARE; } -/******************************************************************/ +/*****************************************************************************/ static gboolean is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags) @@ -318,7 +318,7 @@ notify_new_device_added (NMDevice *device, NMDevice *new_device) nm_device_vlan_set_parent (self, new_device); } -/******************************************************************/ +/*****************************************************************************/ static gboolean match_parent (NMDeviceVlan *self, const char *parent) @@ -599,7 +599,7 @@ ip4_config_pre_commit (NMDevice *device, NMIP4Config *config) } } -/******************************************************************/ +/*****************************************************************************/ static void nm_device_vlan_init (NMDeviceVlan * self) @@ -687,7 +687,7 @@ nm_device_vlan_class_init (NMDeviceVlanClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_VLAN_FACTORY (nm_vlan_factory_get_type ()) #define NM_VLAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VLAN_FACTORY, NMVlanFactory)) diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c index 674c2a787d..05df4d9993 100644 --- a/src/devices/nm-device-vxlan.c +++ b/src/devices/nm-device-vxlan.c @@ -71,7 +71,7 @@ enum { LAST_PROP }; -/**************************************************************/ +/*****************************************************************************/ static void update_properties (NMDevice *device) @@ -543,7 +543,7 @@ ip4_config_pre_commit (NMDevice *device, NMIP4Config *config) } } -/**************************************************************/ +/*****************************************************************************/ static void nm_device_vxlan_init (NMDeviceVxlan *self) @@ -771,7 +771,7 @@ nm_device_vxlan_class_init (NMDeviceVxlanClass *klass) NULL); } -/*************************************************************/ +/*****************************************************************************/ #define NM_TYPE_VXLAN_FACTORY (nm_vxlan_factory_get_type ()) #define NM_VXLAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VXLAN_FACTORY, NMVxlanFactory)) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c41d8e4eba..d681f9d46d 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -135,7 +135,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDevice, #define DEFAULT_AUTOCONNECT TRUE -/***********************************************************/ +/*****************************************************************************/ #define PENDING_ACTION_DHCP4 "dhcp4" #define PENDING_ACTION_DHCP6 "dhcp6" @@ -465,7 +465,7 @@ static void nm_device_set_mtu (NMDevice *self, guint32 mtu); static void dhcp_schedule_restart (NMDevice *self, int family, const char *reason); static void _cancel_activation (NMDevice *self); -/***********************************************************/ +/*****************************************************************************/ #define QUEUED_PREFIX "queued state change to " @@ -569,7 +569,7 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_reason_to_string, NMDeviceStateReason, #define reason_to_string(reason) \ NM_UTILS_LOOKUP_STR (_reason_to_string, reason) -/***********************************************************/ +/*****************************************************************************/ NMSettings * nm_device_get_settings (NMDevice *self) @@ -603,7 +603,7 @@ init_ip6_config_dns_priority (NMDevice *self, NMIP6Config *config) nm_ip6_config_set_dns_priority (config, priority ?: NM_DNS_PRIORITY_DEFAULT_NORMAL); } -/***********************************************************/ +/*****************************************************************************/ gboolean nm_device_ipv6_sysctl_set (NMDevice *self, const char *property, const char *value) @@ -634,7 +634,7 @@ _add_capabilities (NMDevice *self, NMDeviceCapabilities capabilities) } } -/***********************************************************/ +/*****************************************************************************/ static const char * _get_stable_id (NMConnection *connection, NMUtilsStableType *out_stable_type) @@ -658,7 +658,7 @@ _get_stable_id (NMConnection *connection, NMUtilsStableType *out_stable_type) return stable_id; } -/***********************************************************/ +/*****************************************************************************/ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_ip_state_to_string, IpState, NM_UTILS_LOOKUP_DEFAULT_WARN ("unknown"), @@ -1320,7 +1320,7 @@ nm_device_get_physical_port_id (NMDevice *self) return NM_DEVICE_GET_PRIVATE (self)->physical_port_id; } -/***********************************************************/ +/*****************************************************************************/ static gboolean nm_device_uses_generated_assumed_connection (NMDevice *self) @@ -4245,7 +4245,7 @@ nm_device_ip_method_failed (NMDevice *self, int family, NMDeviceStateReason reas nm_device_state_changed (self, NM_DEVICE_STATE_FAILED, reason); } -/*********************************************/ +/*****************************************************************************/ /* IPv4 DAD stuff */ static guint @@ -4429,7 +4429,7 @@ ipv4_dad_start (NMDevice *self, NMIP4Config **configs, ArpingCallback cb) } } -/*********************************************/ +/*****************************************************************************/ /* IPv4LL stuff */ static void @@ -4620,7 +4620,7 @@ fail: return NM_ACT_STAGE_RETURN_FAILURE; } -/*********************************************/ +/*****************************************************************************/ static gboolean _device_get_default_route_from_platform (NMDevice *self, int addr_family, NMPlatformIPRoute *out_route) @@ -4666,7 +4666,7 @@ _device_get_default_route_from_platform (NMDevice *self, int addr_family, NMPlat return success; } -/*********************************************/ +/*****************************************************************************/ static void ensure_con_ip4_config (NMDevice *self) @@ -4720,7 +4720,7 @@ ensure_con_ip6_config (NMDevice *self) } } -/*********************************************/ +/*****************************************************************************/ /* DHCPv4 stuff */ static void @@ -5218,7 +5218,7 @@ nm_device_dhcp4_renew (NMDevice *self, gboolean release) return (ret != NM_ACT_STAGE_RETURN_FAILURE); } -/*********************************************/ +/*****************************************************************************/ static GHashTable *shared_ips = NULL; @@ -5288,7 +5288,7 @@ shared4_new_config (NMDevice *self, NMConnection *connection, NMDeviceStateReaso return config; } -/*********************************************/ +/*****************************************************************************/ static gboolean connection_ip4_method_requires_carrier (NMConnection *connection, @@ -5466,7 +5466,7 @@ act_stage3_ip4_config_start (NMDevice *self, return ret; } -/*********************************************/ +/*****************************************************************************/ /* DHCPv6 stuff */ static void @@ -6045,7 +6045,7 @@ nm_device_dhcp6_renew (NMDevice *self, gboolean release) return dhcp6_start (self, FALSE, NULL); } -/******************************************/ +/*****************************************************************************/ static void linklocal6_cleanup (NMDevice *self) @@ -6225,7 +6225,7 @@ linklocal6_start (NMDevice *self) return NM_ACT_STAGE_RETURN_POSTPONE; } -/******************************************/ +/*****************************************************************************/ static void nm_device_ipv6_set_mtu (NMDevice *self, guint32 mtu); @@ -6548,7 +6548,7 @@ addrconf6_cleanup (NMDevice *self) g_clear_object (&priv->rdisc); } -/******************************************/ +/*****************************************************************************/ static const char *ip6_properties_to_save[] = { "accept_ra", @@ -6644,7 +6644,7 @@ set_nm_ipv6ll (NMDevice *self, gboolean enable) } } -/************************************************************************/ +/*****************************************************************************/ static NMSettingIP6ConfigPrivacy _ip6_privacy_clamp (NMSettingIP6ConfigPrivacy use_tempaddr) @@ -6702,7 +6702,7 @@ _ip6_privacy_get (NMDevice *self) return _ip6_privacy_clamp (ip6_privacy); } -/****************************************************************/ +/*****************************************************************************/ static gboolean ip6_requires_slaves (NMConnection *connection) @@ -8852,7 +8852,7 @@ nm_device_get_ip6_config (NMDevice *self) return NM_DEVICE_GET_PRIVATE (self)->ip6_config; } -/****************************************************************/ +/*****************************************************************************/ static void dispatcher_cleanup (NMDevice *self) @@ -8882,7 +8882,7 @@ dispatcher_complete_proceed_state (guint call_id, gpointer user_data) priv->dispatcher.post_state_reason = NM_DEVICE_STATE_REASON_NONE; } -/****************************************************************/ +/*****************************************************************************/ static void ip_check_pre_up (NMDevice *self) @@ -9110,7 +9110,7 @@ nm_device_start_ip_check (NMDevice *self) ip_check_pre_up (self); } -/****************************************************************/ +/*****************************************************************************/ static gboolean carrier_wait_timeout (gpointer user_data) @@ -10663,7 +10663,7 @@ nm_device_has_pending_action (NMDevice *self) return !!priv->pending_actions; } -/***********************************************************/ +/*****************************************************************************/ static void _cancel_activation (NMDevice *self) @@ -11025,7 +11025,7 @@ nm_device_spawn_iface_helper (NMDevice *self) g_ptr_array_unref (argv); } -/***********************************************************/ +/*****************************************************************************/ static gboolean ip_config_valid (NMDeviceState state) @@ -11566,7 +11566,7 @@ nm_device_get_state (NMDevice *self) return NM_DEVICE_GET_PRIVATE (self)->state; } -/***********************************************************/ +/*****************************************************************************/ /* NMConfigDevice interface related stuff */ const char * @@ -12121,7 +12121,7 @@ spec_match_list (NMDevice *self, const GSList *specs) return matched; } -/***********************************************************/ +/*****************************************************************************/ static const char * _activation_func_to_string (ActivationHandleFunc func) @@ -12141,7 +12141,7 @@ _activation_func_to_string (ActivationHandleFunc func) g_return_val_if_reached ("unknown"); } -/***********************************************************/ +/*****************************************************************************/ static void nm_device_init (NMDevice *self) diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 09eefe7014..b0504b5754 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -61,7 +61,7 @@ typedef struct { static gboolean teamd_start (NMDevice *device, NMSettingTeam *s_team); -/******************************************************************/ +/*****************************************************************************/ static NMDeviceCapabilities get_generic_capabilities (NMDevice *device) @@ -214,7 +214,7 @@ update_connection (NMDevice *device, NMConnection *connection) g_object_set (G_OBJECT (s_team), NM_SETTING_TEAM_CONFIG, priv->config, NULL); } -/******************************************************************/ +/*****************************************************************************/ static gboolean master_update_slave_connection (NMDevice *self, @@ -281,7 +281,7 @@ master_update_slave_connection (NMDevice *self, return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static void teamd_cleanup (NMDevice *device, gboolean free_tdc) @@ -748,7 +748,7 @@ create_and_realize (NMDevice *device, return TRUE; } -/******************************************************************/ +/*****************************************************************************/ NMDevice * nm_device_team_new (const char *iface) diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c index edb1329995..08cb15d268 100644 --- a/src/devices/team/nm-team-factory.c +++ b/src/devices/team/nm-team-factory.c @@ -37,7 +37,7 @@ static void device_factory_interface_init (NMDeviceFactoryInterface *factory_ifa G_DEFINE_TYPE_EXTENDED (NMTeamFactory, nm_team_factory, G_TYPE_OBJECT, 0, G_IMPLEMENT_INTERFACE (NM_TYPE_DEVICE_FACTORY, device_factory_interface_init)) -/************************************************************************/ +/*****************************************************************************/ G_MODULE_EXPORT NMDeviceFactory * nm_device_factory_create (GError **error) @@ -46,7 +46,7 @@ nm_device_factory_create (GError **error) return (NMDeviceFactory *) g_object_new (NM_TYPE_TEAM_FACTORY, NULL); } -/************************************************************************/ +/*****************************************************************************/ static NMDevice * create_device (NMDeviceFactory *factory, @@ -63,7 +63,7 @@ NM_DEVICE_FACTORY_DECLARE_TYPES ( NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_TEAM_SETTING_NAME) ) -/************************************************************************/ +/*****************************************************************************/ static void nm_team_factory_init (NMTeamFactory *self) diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 32ebac3b74..3bbe60884f 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -74,7 +74,7 @@ struct _NMDeviceOlpcMeshPrivate { gboolean stage1_waiting; }; -/*******************************************************************/ +/*****************************************************************************/ static gboolean check_connection_compatible (NMDevice *device, NMConnection *connection) @@ -152,7 +152,7 @@ complete_connection (NMDevice *device, return TRUE; } -/****************************************************************************/ +/*****************************************************************************/ static NMActStageReturn act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) @@ -245,7 +245,7 @@ is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags) return TRUE; } -/*******************************************************************/ +/*****************************************************************************/ static void companion_cleanup (NMDeviceOlpcMesh *self) @@ -415,7 +415,7 @@ state_changed (NMDevice *device, find_companion (NM_DEVICE_OLPC_MESH (device)); } -/*******************************************************************/ +/*****************************************************************************/ NMDevice * nm_device_olpc_mesh_new (const char *iface) diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index f98a40be63..a3c4e6c39c 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -2349,7 +2349,7 @@ error: return NULL; } -/****************************************************************************/ +/*****************************************************************************/ static NMActStageReturn act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) @@ -3000,7 +3000,7 @@ set_enabled (NMDevice *device, gboolean enabled) } } -/********************************************************************/ +/*****************************************************************************/ NMDevice * nm_device_wifi_new (const char *iface, NMDeviceWifiCapabilities capabilities) diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index 2232f826c3..e723cd868b 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -85,7 +85,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMAccessPoint, PROP_LAST_SEEN, ); -/*****************************************************************/ +/*****************************************************************************/ const char * nm_ap_get_supplicant_path (NMAccessPoint *ap) @@ -344,7 +344,7 @@ nm_ap_set_last_seen (NMAccessPoint *ap, gint32 last_seen) } } -/*****************************************************************/ +/*****************************************************************************/ static NM80211ApSecurityFlags security_from_vardict (GVariant *security) @@ -871,7 +871,7 @@ nm_ap_complete_connection (NMAccessPoint *self, error); } -/*****************************************************************/ +/*****************************************************************************/ static void nm_ap_init (NMAccessPoint *ap) diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c index 2d5f8faf00..2259daac60 100644 --- a/src/devices/wifi/nm-wifi-factory.c +++ b/src/devices/wifi/nm-wifi-factory.c @@ -48,7 +48,7 @@ static void device_factory_interface_init (NMDeviceFactoryInterface *factory_ifa G_DEFINE_TYPE_EXTENDED (NMWifiFactory, nm_wifi_factory, G_TYPE_OBJECT, 0, G_IMPLEMENT_INTERFACE (NM_TYPE_DEVICE_FACTORY, device_factory_interface_init)) -/**************************************************************************/ +/*****************************************************************************/ G_MODULE_EXPORT NMDeviceFactory * nm_device_factory_create (GError **error) @@ -56,7 +56,7 @@ nm_device_factory_create (GError **error) return (NMDeviceFactory *) g_object_new (NM_TYPE_WIFI_FACTORY, NULL); } -/**************************************************************************/ +/*****************************************************************************/ static NMDevice * create_device (NMDeviceFactory *factory, diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c index dbe185b3a8..1ef18e6af9 100644 --- a/src/devices/wifi/tests/test-wifi-ap-utils.c +++ b/src/devices/wifi/tests/test-wifi-ap-utils.c @@ -30,7 +30,7 @@ #define DEBUG 1 -/*******************************************/ +/*****************************************************************************/ #define COMPARE(src, expected, success, error, edomain, ecode) \ { \ @@ -246,7 +246,7 @@ create_basic (const char *ssid, return connection; } -/*******************************************/ +/*****************************************************************************/ static void test_lock_bssid (void) @@ -270,7 +270,7 @@ test_lock_bssid (void) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_open_ap_empty_connection (void) @@ -298,7 +298,7 @@ test_open_ap_empty_connection (void) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_open_ap_leap_connection_1 (gconstpointer add_wifi) @@ -330,7 +330,7 @@ test_open_ap_leap_connection_1 (gconstpointer add_wifi) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_open_ap_leap_connection_2 (void) @@ -360,7 +360,7 @@ test_open_ap_leap_connection_2 (void) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_open_ap_wep_connection (gconstpointer add_wifi) @@ -394,7 +394,7 @@ test_open_ap_wep_connection (gconstpointer add_wifi) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_ap_wpa_psk_connection_base (const char *key_mgmt, @@ -515,7 +515,7 @@ test_open_ap_wpa_psk_connection_5 (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static void test_ap_wpa_eap_connection_base (const char *key_mgmt, @@ -707,7 +707,7 @@ test_ap_wpa_eap_connection_5 (gconstpointer data) error_code_for_idx (idx, 5)); } -/*******************************************/ +/*****************************************************************************/ static void test_priv_ap_empty_connection (void) @@ -741,7 +741,7 @@ test_priv_ap_empty_connection (void) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_priv_ap_leap_connection_1 (gconstpointer add_wifi) @@ -788,7 +788,7 @@ test_priv_ap_leap_connection_1 (gconstpointer add_wifi) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_priv_ap_leap_connection_2 (void) @@ -821,7 +821,7 @@ test_priv_ap_leap_connection_2 (void) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_priv_ap_dynamic_wep_1 (void) @@ -870,7 +870,7 @@ test_priv_ap_dynamic_wep_1 (void) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_priv_ap_dynamic_wep_2 (void) @@ -918,7 +918,7 @@ test_priv_ap_dynamic_wep_2 (void) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_priv_ap_dynamic_wep_3 (void) @@ -955,7 +955,7 @@ test_priv_ap_dynamic_wep_3 (void) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_priv_ap_wpa_psk_connection_1 (void) @@ -1040,7 +1040,7 @@ test_priv_ap_wpa_psk_connection_5 (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static void test_wpa_ap_empty_connection (gconstpointer data) @@ -1077,7 +1077,7 @@ test_wpa_ap_empty_connection (gconstpointer data) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_wpa_ap_leap_connection_1 (gconstpointer data) @@ -1113,7 +1113,7 @@ test_wpa_ap_leap_connection_1 (gconstpointer data) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_wpa_ap_leap_connection_2 (gconstpointer data) @@ -1147,7 +1147,7 @@ test_wpa_ap_leap_connection_2 (gconstpointer data) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_wpa_ap_dynamic_wep_connection (gconstpointer data) @@ -1180,7 +1180,7 @@ test_wpa_ap_dynamic_wep_connection (gconstpointer data) g_object_unref (src); } -/*******************************************/ +/*****************************************************************************/ static void test_wpa_ap_wpa_psk_connection_1 (gconstpointer data) @@ -1283,7 +1283,7 @@ test_wpa_ap_wpa_psk_connection_5 (gconstpointer data) g_object_unref (expected); } -/*******************************************/ +/*****************************************************************************/ static void test_strength_dbm (void) @@ -1334,7 +1334,7 @@ test_strength_wext (void) g_assert_cmpint (nm_ap_utils_level_to_quality (215), ==, 99); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index f6ca0e9224..100f2d71f8 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -455,7 +455,7 @@ deactivate (NMDevice *device) nm_modem_deactivate (NM_DEVICE_MODEM_GET_PRIVATE (device)->modem, device); } -/***********************************************************/ +/*****************************************************************************/ static gboolean deactivate_async_finish (NMDevice *self, @@ -497,7 +497,7 @@ deactivate_async (NMDevice *self, simple); } -/***********************************************************/ +/*****************************************************************************/ static NMActStageReturn act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index 964485fc34..d12856c9ff 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -67,7 +67,7 @@ enum { }; static guint signals[LAST_SIGNAL] = { 0 }; -/************************************************************************/ +/*****************************************************************************/ static void handle_new_modem (NMModemManager *self, NMModem *modem) @@ -546,7 +546,7 @@ bus_get_ready (GObject *source, #endif } -/************************************************************************/ +/*****************************************************************************/ static void nm_modem_manager_init (NMModemManager *self) diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c index 507935fc4a..23c2c44b40 100644 --- a/src/devices/wwan/nm-wwan-factory.c +++ b/src/devices/wwan/nm-wwan-factory.c @@ -44,7 +44,7 @@ typedef struct { NMModemManager *mm; } NMWwanFactoryPrivate; -/************************************************************************/ +/*****************************************************************************/ G_MODULE_EXPORT NMDeviceFactory * nm_device_factory_create (GError **error) @@ -52,7 +52,7 @@ nm_device_factory_create (GError **error) return (NMDeviceFactory *) g_object_new (NM_TYPE_WWAN_FACTORY, NULL); } -/************************************************************************/ +/*****************************************************************************/ static void modem_added_cb (NMModemManager *manager, diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 3be2ea03f7..36e04e8e53 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -81,7 +81,7 @@ enum { LAST_PROP }; -/********************************************/ +/*****************************************************************************/ pid_t nm_dhcp_client_get_pid (NMDhcpClient *self) @@ -186,7 +186,7 @@ nm_dhcp_client_get_fqdn (NMDhcpClient *self) return NM_DHCP_CLIENT_GET_PRIVATE (self)->fqdn; } -/********************************************/ +/*****************************************************************************/ static const char *state_table[NM_DHCP_STATE_MAX + 1] = { [NM_DHCP_STATE_UNKNOWN] = "unknown", @@ -232,7 +232,7 @@ reason_to_state (NMDhcpClient *self, const char *iface, const char *reason) return NM_DHCP_STATE_UNKNOWN; } -/********************************************/ +/*****************************************************************************/ static void timeout_cleanup (NMDhcpClient *self) @@ -618,7 +618,7 @@ nm_dhcp_client_stop (NMDhcpClient *self, gboolean release) nm_dhcp_client_set_state (self, NM_DHCP_STATE_DONE, NULL, NULL); } -/********************************************/ +/*****************************************************************************/ static char * bytearray_variant_to_string (NMDhcpClient *self, GVariant *value, const char *key) @@ -776,7 +776,7 @@ nm_dhcp_client_handle_event (gpointer unused, return TRUE; } -/********************************************/ +/*****************************************************************************/ static void nm_dhcp_client_init (NMDhcpClient *self) diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index bd02062426..6eed354348 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -600,7 +600,7 @@ get_duid (NMDhcpClient *client) return duid ? duid : NM_DHCP_CLIENT_CLASS (nm_dhcp_dhclient_parent_class)->get_duid (client); } -/***************************************************/ +/*****************************************************************************/ static const char *def_leasefiles[] = { SYSCONFDIR "/dhclient6.leases", diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 17ec993a5f..6fb18e79c6 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -187,7 +187,7 @@ stop (NMDhcpClient *client, gboolean release, const GByteArray *duid) /* FIXME: implement release... */ } -/***************************************************/ +/*****************************************************************************/ static void nm_dhcp_dhcpcd_init (NMDhcpDhcpcd *self) diff --git a/src/dhcp-manager/nm-dhcp-helper-api.h b/src/dhcp-manager/nm-dhcp-helper-api.h index a3eb171dc5..5834421563 100644 --- a/src/dhcp-manager/nm-dhcp-helper-api.h +++ b/src/dhcp-manager/nm-dhcp-helper-api.h @@ -22,7 +22,7 @@ #ifndef __NM_DHCP_HELPER_API_H__ #define __NM_DHCP_HELPER_API_H__ -/******************************************************************************/ +/*****************************************************************************/ #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" @@ -31,6 +31,6 @@ #define NM_DHCP_HELPER_SERVER_INTERFACE_NAME "org.freedesktop.nm_dhcp_server" #define NM_DHCP_HELPER_SERVER_METHOD_NOTIFY "Notify" -/******************************************************************************/ +/*****************************************************************************/ #endif /* __NM_DHCP_HELPER_API_H__ */ diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index 0df4197389..d0e7b8c2ee 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -269,7 +269,7 @@ dis_connection_cb (NMBusManager *mgr, } } -/***************************************************/ +/*****************************************************************************/ static void nm_dhcp_listener_init (NMDhcpListener *self) diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 50469c5cd5..5b584cf36f 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -56,7 +56,7 @@ typedef struct { G_DEFINE_TYPE (NMDhcpManager, nm_dhcp_manager, G_TYPE_OBJECT) -/***************************************************/ +/*****************************************************************************/ typedef struct { GType gtype; @@ -124,7 +124,7 @@ is_client_enabled (const char *name) return G_TYPE_INVALID; } -/***************************************************/ +/*****************************************************************************/ static NMDhcpClient * get_client_for_ifindex (NMDhcpManager *manager, int ifindex, gboolean ip6) @@ -356,7 +356,7 @@ nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self, return NULL; } -/***************************************************/ +/*****************************************************************************/ NM_DEFINE_SINGLETON_GETTER (NMDhcpManager, nm_dhcp_manager_get, NM_TYPE_DHCP_MANAGER); diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 31c6f76089..b3c3fa6aa1 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -51,7 +51,7 @@ typedef struct { gboolean info_only; } NMDhcpSystemdPrivate; -/************************************************************/ +/*****************************************************************************/ #define DHCP_OPTION_NIS_DOMAIN 40 #define DHCP_OPTION_NIS_SERVERS 41 @@ -388,7 +388,7 @@ lease_to_ip4_config (const char *iface, return ip4_config; } -/************************************************************/ +/*****************************************************************************/ static char * get_leasefile_path (const char *iface, const char *uuid, gboolean ipv6) @@ -427,7 +427,7 @@ nm_dhcp_systemd_get_lease_ip_configs (const char *iface, return leases; } -/************************************************************/ +/*****************************************************************************/ static void _save_client_id (NMDhcpSystemd *self, @@ -990,7 +990,7 @@ stop (NMDhcpClient *client, gboolean release, const GByteArray *duid) _LOGW ("failed to stop client (%d)", r); } -/***************************************************/ +/*****************************************************************************/ static void nm_dhcp_systemd_init (NMDhcpSystemd *self) diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c index 593d8c5d91..a7d4f4a4ee 100644 --- a/src/dhcp-manager/nm-dhcp-utils.c +++ b/src/dhcp-manager/nm-dhcp-utils.c @@ -31,7 +31,7 @@ #include "nm-dhcp-client-logging.h" #include "nm-core-internal.h" -/********************************************/ +/*****************************************************************************/ static gboolean ip4_process_dhcpcd_rfc3442_routes (const char *iface, @@ -596,7 +596,7 @@ error: return NULL; } -/********************************************/ +/*****************************************************************************/ static void ip6_add_domain_search (gpointer data, gpointer user_data) diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c index 77849c8c38..388e42e2ef 100644 --- a/src/dhcp-manager/tests/test-dhcp-dhclient.c +++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c @@ -86,7 +86,7 @@ test_config (const char *orig, g_assert (new_client_id == NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *orig_missing_expected = \ "# Created by NetworkManager\n" @@ -108,7 +108,7 @@ test_orig_missing (void) test_config (NULL, orig_missing_expected, FALSE, NULL, NULL, NULL, NULL, "eth0", NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *override_client_id_orig = \ "send dhcp-client-identifier 00:30:04:20:7A:08;\n"; @@ -141,7 +141,7 @@ test_override_client_id (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *quote_client_id_expected = \ "# Created by NetworkManager\n" @@ -170,7 +170,7 @@ test_quote_client_id (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *ascii_client_id_expected = \ "# Created by NetworkManager\n" @@ -199,7 +199,7 @@ test_ascii_client_id (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *hex_single_client_id_expected = \ "# Created by NetworkManager\n" @@ -228,7 +228,7 @@ test_hex_single_client_id (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *existing_hex_client_id_orig = \ "send dhcp-client-identifier 00:30:04:20:7A:08;\n"; @@ -265,7 +265,7 @@ test_existing_hex_client_id (void) NULL); } -/*******************************************/ +/*****************************************************************************/ #define EACID "qb:cd:ef:12:34:56" @@ -304,7 +304,7 @@ test_existing_ascii_client_id (void) "eth0", NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *fqdn_expected = \ "# Created by NetworkManager\n" @@ -374,7 +374,7 @@ test_fqdn_options_override (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *override_hostname_orig = \ "send host-name \"foobar\";\n"; @@ -407,7 +407,7 @@ test_override_hostname (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *override_hostname6_orig = \ "send fqdn.fqdn \"foobar\";\n"; @@ -436,7 +436,7 @@ test_override_hostname6 (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *nonfqdn_hostname6_expected = \ "# Created by NetworkManager\n" @@ -458,7 +458,7 @@ test_nonfqdn_hostname6 (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *existing_alsoreq_orig = \ "also request something;\n" @@ -494,7 +494,7 @@ test_existing_alsoreq (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static const char *existing_multiline_alsoreq_orig = \ "also request something another-thing yet-another-thing\n" @@ -533,7 +533,7 @@ test_existing_multiline_alsoreq (void) NULL); } -/*******************************************/ +/*****************************************************************************/ static void test_one_duid (const char *escaped, const guint8 *unescaped, guint len) @@ -703,7 +703,7 @@ test_write_existing_commented_duid (void) g_free (contents); } -/*******************************************/ +/*****************************************************************************/ static void test_read_lease_ip4_config_basic (void) @@ -827,7 +827,7 @@ test_read_lease_ip4_config_expect_failure (gconstpointer user_data) g_free (contents); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 69b260687e..c6c4928fee 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -605,7 +605,7 @@ update (NMDnsPlugin *plugin, return TRUE; } -/****************************************************************/ +/*****************************************************************************/ static void child_quit (NMDnsPlugin *plugin, gint status) @@ -637,7 +637,7 @@ child_quit (NMDnsPlugin *plugin, gint status) g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED); } -/****************************************************************/ +/*****************************************************************************/ static gboolean is_caching (NMDnsPlugin *plugin) @@ -651,7 +651,7 @@ get_name (NMDnsPlugin *plugin) return "dnsmasq"; } -/****************************************************************/ +/*****************************************************************************/ NMDnsPlugin * nm_dns_dnsmasq_new (void) diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index c1d2bf77f6..33f2074ead 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -90,7 +90,7 @@ typedef enum { SR_ERROR } SpawnResult; -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_PREFIX_NAME "dns-mgr" #define _NMLOG_DOMAIN LOGD_DNS @@ -112,7 +112,7 @@ typedef enum { } \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ typedef struct { GPtrArray *configs; @@ -1519,7 +1519,7 @@ nm_dns_manager_end_updates (NMDnsManager *self, const char *func) memset (priv->prev_hash, 0, sizeof (priv->prev_hash)); } -/******************************************************************/ +/*****************************************************************************/ static gboolean _clear_plugin (NMDnsManager *self) diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c index f065a1ceca..53ca4d5ef6 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns-manager/nm-dns-plugin.c @@ -48,7 +48,7 @@ enum { }; static guint signals[LAST_SIGNAL] = { 0 }; -/******************************************************************************/ +/*****************************************************************************/ #define _NMLOG_PREFIX_NAME "dns-plugin" #define _NMLOG_DOMAIN LOGD_DNS @@ -70,7 +70,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; } \ } G_STMT_END -/******************************************************************************/ +/*****************************************************************************/ gboolean nm_dns_plugin_update (NMDnsPlugin *self, @@ -105,7 +105,7 @@ nm_dns_plugin_get_name (NMDnsPlugin *self) return NM_DNS_PLUGIN_GET_CLASS (self)->get_name (self); } -/********************************************/ +/*****************************************************************************/ static void _clear_pidfile (NMDnsPlugin *self) @@ -260,7 +260,7 @@ nm_dns_plugin_stop (NMDnsPlugin *self) nm_dns_plugin_child_kill (self); } -/********************************************/ +/*****************************************************************************/ static void nm_dns_plugin_init (NMDnsPlugin *self) diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns-manager/nm-dns-systemd-resolved.c index 6d9867b84a..3655449cfb 100644 --- a/src/dns-manager/nm-dns-systemd-resolved.c +++ b/src/dns-manager/nm-dns-systemd-resolved.c @@ -303,7 +303,7 @@ update (NMDnsPlugin *plugin, return TRUE; } -/****************************************************************/ +/*****************************************************************************/ static gboolean is_caching (NMDnsPlugin *plugin) @@ -317,7 +317,7 @@ get_name (NMDnsPlugin *plugin) return "systemd-resolved"; } -/****************************************************************/ +/*****************************************************************************/ NMDnsPlugin * nm_dns_systemd_resolved_new (void) diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c index 66a287fdf5..b9d5749d69 100644 --- a/src/dns-manager/nm-dns-unbound.c +++ b/src/dns-manager/nm-dns-unbound.c @@ -24,7 +24,7 @@ G_DEFINE_TYPE (NMDnsUnbound, nm_dns_unbound, NM_TYPE_DNS_PLUGIN) -/*******************************************/ +/*****************************************************************************/ static gboolean update (NMDnsPlugin *plugin, @@ -56,7 +56,7 @@ get_name (NMDnsPlugin *plugin) return "unbound"; } -/****************************************************************/ +/*****************************************************************************/ NMDnsPlugin * nm_dns_unbound_new (void) diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index 7b72594434..9ce8d833d1 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -108,7 +108,7 @@ nm_cmd_line_add_string (NMCmdLine *cmd, const char *str) g_ptr_array_add (cmd->array, g_string_chunk_insert (cmd->chunk, str)); } -/*******************************************/ +/*****************************************************************************/ static void dm_watch_cb (GPid pid, gint status, gpointer user_data) diff --git a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c index cf6dab50bb..92f32de87f 100644 --- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c +++ b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c @@ -83,7 +83,7 @@ test_address_ranges (void) g_free (error_desc); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 6da89432a8..9a10bf3b2b 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -61,7 +61,7 @@ enum { LAST_PROP }; -/*******************************************************************/ +/*****************************************************************************/ NMSettingsConnection * nm_act_request_get_settings_connection (NMActRequest *req) @@ -79,7 +79,7 @@ nm_act_request_get_applied_connection (NMActRequest *req) return nm_active_connection_get_applied_connection (NM_ACTIVE_CONNECTION (req)); } -/*******************************************************************/ +/*****************************************************************************/ struct _NMActRequestGetSecretsCallId { NMActRequest *self; @@ -245,7 +245,7 @@ nm_act_request_clear_secrets (NMActRequest *self) nm_active_connection_clear_secrets ((NMActiveConnection *) self); } -/********************************************************************/ +/*****************************************************************************/ static void clear_share_rules (NMActRequest *req) @@ -346,7 +346,7 @@ nm_act_request_add_share_rule (NMActRequest *req, priv->share_rules = g_slist_prepend (priv->share_rules, rule); } -/********************************************************************/ +/*****************************************************************************/ static void device_notify (GObject *object, @@ -456,7 +456,7 @@ master_failed (NMActiveConnection *self) nm_active_connection_set_state (self, NM_ACTIVE_CONNECTION_STATE_DEACTIVATED); } -/********************************************************************/ +/*****************************************************************************/ /** * nm_act_request_new: diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 503c53191b..6dc33f697e 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -108,7 +108,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static void check_master_ready (NMActiveConnection *self); static void _device_cleanup (NMActiveConnection *self); -/****************************************************************/ +/*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_DEVICE #define _NMLOG_PREFIX_NAME "active-connection" @@ -123,7 +123,7 @@ static void _device_cleanup (NMActiveConnection *self); _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ } G_STMT_END -/****************************************************************/ +/*****************************************************************************/ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_state_to_string, NMActiveConnectionState, NM_UTILS_LOOKUP_DEFAULT (NULL), @@ -135,7 +135,7 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_state_to_string, NMActiveConnectionState, ); #define state_to_string(state) NM_UTILS_LOOKUP_STR (_state_to_string, state) -/****************************************************************/ +/*****************************************************************************/ static void _settings_connection_updated (NMSettingsConnection *connection, @@ -336,7 +336,7 @@ nm_active_connection_has_unmodified_applied_connection (NMActiveConnection *self compare_flags); } -/*******************************************************************/ +/*****************************************************************************/ void nm_active_connection_clear_secrets (NMActiveConnection *self) @@ -354,7 +354,7 @@ nm_active_connection_clear_secrets (NMActiveConnection *self) nm_connection_clear_secrets (priv->applied_connection); } -/*******************************************************************/ +/*****************************************************************************/ const char * nm_active_connection_get_specific_object (NMActiveConnection *self) @@ -718,7 +718,7 @@ nm_active_connection_get_assumed (NMActiveConnection *self) return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->assumed; } -/****************************************************************/ +/*****************************************************************************/ static void unwatch_parent (NMActiveConnection *self, gboolean unref); @@ -782,7 +782,7 @@ nm_active_connection_set_parent (NMActiveConnection *self, NMActiveConnection *p g_object_weak_ref ((GObject *) priv->parent, parent_destroyed, self); } -/****************************************************************/ +/*****************************************************************************/ static void auth_done (NMAuthChain *chain, @@ -901,7 +901,7 @@ nm_active_connection_authorize (NMActiveConnection *self, priv->user_data2 = user_data2; } -/****************************************************************/ +/*****************************************************************************/ static guint64 _version_id_new (void) @@ -932,7 +932,7 @@ nm_active_connection_version_id_bump (NMActiveConnection *self) return priv->version_id; } -/****************************************************************/ +/*****************************************************************************/ static void nm_active_connection_init (NMActiveConnection *self) diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index 54d359598e..2a5f007066 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -70,7 +70,7 @@ G_DEFINE_TYPE (NMAuthSubject, nm_auth_subject, G_TYPE_OBJECT) #define NM_AUTH_SUBJECT_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMAuthSubject, NM_IS_AUTH_SUBJECT) -/**************************************************************/ +/*****************************************************************************/ #define CHECK_SUBJECT(self, error_value) \ NMAuthSubjectPrivate *priv; \ @@ -172,7 +172,7 @@ nm_auth_subject_get_unix_process_dbus_sender (NMAuthSubject *subject) return priv->unix_process.dbus_sender; } -/**************************************************************/ +/*****************************************************************************/ static NMAuthSubject * _new_unix_process (GDBusMethodInvocation *context, @@ -256,7 +256,7 @@ nm_auth_subject_new_internal (void) NULL)); } -/**************************************************************/ +/*****************************************************************************/ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index 270792ef9d..0c1ad69e3b 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -113,7 +113,7 @@ nm_bus_manager_setup (NMBusManager *instance) _LOGD ("setup %s singleton (%p)", "NMBusManager", singleton_instance); } -/**************************************************************/ +/*****************************************************************************/ struct _PrivateServer { const char *tag; @@ -382,7 +382,7 @@ private_server_get_connection_by_owner (PrivateServer *s, const char *owner) return NULL; } -/**************************************************************/ +/*****************************************************************************/ static gboolean _bus_get_unix_pid (NMBusManager *self, @@ -616,7 +616,7 @@ nm_bus_manager_get_unix_user (NMBusManager *self, return TRUE; } -/**************************************************************/ +/*****************************************************************************/ static void nm_bus_manager_init (NMBusManager *self) diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 23c4cecdc9..3b021feab5 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -115,7 +115,7 @@ G_DEFINE_TYPE (NMConfigData, nm_config_data, G_TYPE_OBJECT) #define NM_CONFIG_DATA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CONFIG_DATA, NMConfigDataPrivate)) -/************************************************************************/ +/*****************************************************************************/ #define _HAS_PREFIX(str, prefix) \ ({ \ @@ -123,7 +123,7 @@ G_DEFINE_TYPE (NMConfigData, nm_config_data, G_TYPE_OBJECT) g_str_has_prefix ( _str, ""prefix"") && _str[NM_STRLEN(prefix)] != '\0'; \ }) -/************************************************************************/ +/*****************************************************************************/ const char * nm_config_data_get_config_main_file (const NMConfigData *self) @@ -328,7 +328,7 @@ _nm_config_data_get_keyfile_user (const NMConfigData *self) return NM_CONFIG_DATA_GET_PRIVATE (self)->keyfile_user; } -/************************************************************************/ +/*****************************************************************************/ /** * nm_config_data_get_groups: @@ -391,7 +391,7 @@ nm_config_data_is_intern_atomic_group (const NMConfigData *self, const char *gro return g_key_file_has_group (priv->keyfile, group); } -/************************************************************************/ +/*****************************************************************************/ static GKeyFile * _merge_keyfiles (GKeyFile *keyfile_user, GKeyFile *keyfile_intern) @@ -456,7 +456,7 @@ _merge_keyfiles (GKeyFile *keyfile_user, GKeyFile *keyfile_intern) return keyfile; } -/************************************************************************/ +/*****************************************************************************/ static int _nm_config_data_log_sort (const char **pa, const char **pb, gpointer dummy) @@ -595,7 +595,7 @@ nm_config_data_log (const NMConfigData *self, #undef _LOG } -/************************************************************************/ +/*****************************************************************************/ const char *const * nm_global_dns_config_get_searches (const NMGlobalDnsConfig *dns) @@ -1081,7 +1081,7 @@ global_dns_equal (NMGlobalDnsConfig *old, NMGlobalDnsConfig *new) return TRUE; } -/************************************************************************/ +/*****************************************************************************/ static const MatchSectionInfo * _match_section_infos_lookup (const MatchSectionInfo *match_section_infos, @@ -1261,7 +1261,7 @@ _match_section_infos_construct (GKeyFile *keyfile, const char *prefix) return match_section_infos; } -/************************************************************************/ +/*****************************************************************************/ static gboolean _slist_str_equals (GSList *a, GSList *b) @@ -1318,7 +1318,7 @@ nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data) return changes; } -/************************************************************************/ +/*****************************************************************************/ static void get_property (GObject *object, diff --git a/src/nm-config.c b/src/nm-config.c index 8536a77fd5..e1066b9e0f 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -140,11 +140,11 @@ G_DEFINE_TYPE_WITH_CODE (NMConfig, nm_config, G_TYPE_OBJECT, #define NM_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CONFIG, NMConfigPrivate)) -/************************************************************************/ +/*****************************************************************************/ static void _set_config_data (NMConfig *self, NMConfigData *new_data, NMConfigChangeFlags reload_flags); -/************************************************************************/ +/*****************************************************************************/ #define _HAS_PREFIX(str, prefix) \ ({ \ @@ -152,7 +152,7 @@ static void _set_config_data (NMConfig *self, NMConfigData *new_data, NMConfigCh g_str_has_prefix ( _str, ""prefix"") && _str[NM_STRLEN(prefix)] != '\0'; \ }) -/************************************************************************/ +/*****************************************************************************/ gint nm_config_parse_boolean (const char *str, @@ -238,7 +238,7 @@ nm_config_keyfile_set_string_list (GKeyFile *keyfile, g_free (new_value); } -/************************************************************************/ +/*****************************************************************************/ NMConfigData * nm_config_get_data (NMConfig *config) @@ -327,7 +327,7 @@ nm_config_get_is_debug (NMConfig *config) return NM_CONFIG_GET_PRIVATE (config)->cli.is_debug; } -/************************************************************************/ +/*****************************************************************************/ static char ** no_auto_default_from_file (const char *no_auto_default_file) @@ -431,7 +431,7 @@ nm_config_set_no_auto_default_for_device (NMConfig *self, NMDevice *device) _set_config_data (self, new_data, NM_CONFIG_CHANGE_CAUSE_NO_AUTO_DEFAULT); } -/************************************************************************/ +/*****************************************************************************/ static void _nm_config_cmd_line_options_clear (NMConfigCmdLineOptions *cli) @@ -520,7 +520,7 @@ nm_config_cmd_line_options_add_to_entries (NMConfigCmdLineOptions *cli, } } -/************************************************************************/ +/*****************************************************************************/ GKeyFile * nm_config_create_keyfile () @@ -1509,7 +1509,7 @@ intern_config_write (const char *filename, return success; } -/************************************************************************/ +/*****************************************************************************/ GSList * nm_config_get_match_spec (const GKeyFile *keyfile, const char *group, const char *key, gboolean *out_has_key) @@ -1525,7 +1525,7 @@ nm_config_get_match_spec (const GKeyFile *keyfile, const char *group, const char return nm_match_spec_split (value); } -/************************************************************************/ +/*****************************************************************************/ gboolean nm_config_set_global_dns (NMConfig *self, NMGlobalDnsConfig *global_dns, GError **error) diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index 7cf3e70797..4d87359ff2 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -329,7 +329,7 @@ nm_connectivity_check_finish (NMConnectivity *self, return (NMConnectivityState) g_simple_async_result_get_op_res_gssize (simple); } -/**************************************************************************/ +/*****************************************************************************/ NMConnectivity * nm_connectivity_new (const char *uri, diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index e85f9c38bf..00ab2d3800 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -520,7 +520,7 @@ fail: return 0; } -/******************************************************************************************/ +/*****************************************************************************/ typedef struct { pid_t pid; @@ -1167,7 +1167,7 @@ nm_utils_find_helper(const char *progname, const char *try_first, GError **error return nm_utils_file_search_in_paths (progname, try_first, NM_PATHS_DEFAULT, G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); } -/******************************************************************************************/ +/*****************************************************************************/ /** * nm_utils_read_link_absolute: @@ -1201,7 +1201,7 @@ nm_utils_read_link_absolute (const char *link_file, GError **error) return ln_abs; } -/******************************************************************************************/ +/*****************************************************************************/ #define MAC_TAG "mac:" #define INTERFACE_NAME_TAG "interface-name:" @@ -2083,7 +2083,7 @@ nm_utils_cmp_connection_by_autoconnect_priority (NMConnection **a, NMConnection return 0; } -/**************************************************************************/ +/*****************************************************************************/ static gint64 monotonic_timestamp_offset_sec; static int monotonic_timestamp_clock_mode = 0; @@ -2652,7 +2652,7 @@ nm_utils_is_specific_hostname (const char *name) return FALSE; } -/******************************************************************/ +/*****************************************************************************/ gboolean nm_utils_machine_id_parse (const char *id_str, /*uuid_t*/ guchar *out_uuid) diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index 2fd2c7db47..36c7135aec 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -127,11 +127,11 @@ NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get, } \ } G_STMT_END -/***********************************************************************************/ +/*****************************************************************************/ static void _resync_idle_cancel (NMDefaultRouteManager *self); -/***********************************************************************************/ +/*****************************************************************************/ typedef struct { union { @@ -695,7 +695,7 @@ _entry_at_idx_remove (const VTableIP *vtable, NMDefaultRouteManager *self, guint _entry_free (entry); } -/***********************************************************************************/ +/*****************************************************************************/ static void _ipx_update_default_route (const VTableIP *vtable, NMDefaultRouteManager *self, gpointer source) @@ -888,7 +888,7 @@ nm_default_route_manager_ip6_update_default_route (NMDefaultRouteManager *self, _ipx_update_default_route (&vtable_ip6, self, source); } -/***********************************************************************************/ +/*****************************************************************************/ static gboolean _ipx_connection_has_default_route (const VTableIP *vtable, NMDefaultRouteManager *self, NMConnection *connection, gboolean *out_is_never_default) @@ -947,7 +947,7 @@ nm_default_route_manager_ip6_connection_has_default_route (NMDefaultRouteManager return _ipx_connection_has_default_route (&vtable_ip6, self, connection, out_is_never_default); } -/***********************************************************************************/ +/*****************************************************************************/ static NMDevice * _ipx_get_best_device (const VTableIP *vtable, NMDefaultRouteManager *self, const GSList *devices) @@ -1085,7 +1085,7 @@ nm_default_route_manager_ip6_get_best_device (NMDefaultRouteManager *self, const return _ipx_get_best_activating_device (&vtable_ip6, self, devices, preferred_device); } -/***********************************************************************************/ +/*****************************************************************************/ static gpointer _ipx_get_best_config (const VTableIP *vtable, @@ -1218,7 +1218,7 @@ nm_default_route_manager_ip6_get_best_config (NMDefaultRouteManager *self, out_vpn); } -/***********************************************************************************/ +/*****************************************************************************/ static GPtrArray * _v4_get_entries (NMDefaultRouteManagerPrivate *priv) @@ -1242,7 +1242,7 @@ static const VTableIP vtable_ip6 = { .get_entries = _v6_get_entries, }; -/***********************************************************************************/ +/*****************************************************************************/ static gboolean _resync_idle_now (NMDefaultRouteManager *self) @@ -1374,7 +1374,7 @@ _platform_changed_cb (NMPlatform *platform, } } -/***********************************************************************************/ +/*****************************************************************************/ static void set_property (GObject *object, guint prop_id, diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index f1d0170b03..2fcafae6c8 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -56,7 +56,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; NM_DEFINE_SINGLETON_GETTER (NMFirewallManager, nm_firewall_manager_get, NM_TYPE_FIREWALL_MANAGER); -/********************************************************************/ +/*****************************************************************************/ typedef enum { CB_INFO_OPS_ADD = 1, @@ -89,7 +89,7 @@ struct _NMFirewallManagerCallId { }; typedef struct _NMFirewallManagerCallId CBInfo; -/********************************************************************/ +/*****************************************************************************/ static const char * _ops_type_to_string (CBInfoOpsType ops_type) @@ -131,7 +131,7 @@ _ops_type_to_string (CBInfoOpsType ops_type) } \ } G_STMT_END -/********************************************************************/ +/*****************************************************************************/ static gboolean _cb_info_is_idle (CBInfo *info) @@ -396,7 +396,7 @@ nm_firewall_manager_cancel_call (NMFirewallManagerCallId call) } } -/*******************************************************************/ +/*****************************************************************************/ static void set_running (NMFirewallManager *self, gboolean now_running) @@ -428,7 +428,7 @@ name_owner_changed (GObject *object, } } -/*******************************************************************/ +/*****************************************************************************/ static void nm_firewall_manager_init (NMFirewallManager * self) diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index b864530473..3d270fa4df 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -519,7 +519,7 @@ main (int argc, char *argv[]) exit (0); } -/*******************************************************/ +/*****************************************************************************/ /* Stub functions */ void diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index a4d4361248..da3b796c21 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -104,7 +104,7 @@ nm_ip4_config_get_ifindex (const NMIP4Config *config) return NM_IP4_CONFIG_GET_PRIVATE (config)->ifindex; } -/******************************************************************/ +/*****************************************************************************/ static gboolean _ipv4_is_zeronet (in_addr_t network) @@ -113,7 +113,7 @@ _ipv4_is_zeronet (in_addr_t network) return (network & htonl(0xff000000)) == htonl(0x00000000); } -/******************************************************************/ +/*****************************************************************************/ /** * nm_ip4_config_capture_resolv_conf(): @@ -650,7 +650,7 @@ nm_ip4_config_create_setting (const NMIP4Config *config) return NM_SETTING (s_ip4); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src, NMIPConfigMergeFlags merge_flags) @@ -745,7 +745,7 @@ nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src, NMIPConfigMergeFl g_object_thaw_notify (G_OBJECT (dst)); } -/*******************************************************************************/ +/*****************************************************************************/ static int _addresses_get_index (const NMIP4Config *self, const NMPlatformIP4Address *addr) @@ -868,7 +868,7 @@ _wins_get_index (const NMIP4Config *self, guint32 wins_server) return -1; } -/*******************************************************************************/ +/*****************************************************************************/ /** * nm_ip4_config_subtract: @@ -1388,7 +1388,7 @@ nm_ip4_config_destination_is_direct (const NMIP4Config *config, guint32 network, return FALSE; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_set_never_default (NMIP4Config *config, gboolean never_default) @@ -1464,7 +1464,7 @@ nm_ip4_config_get_route_metric (const NMIP4Config *config) return priv->route_metric; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_addresses (NMIP4Config *config) @@ -1570,7 +1570,7 @@ nm_ip4_config_address_exists (const NMIP4Config *config, return _addresses_get_index (config, needle) >= 0; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_routes (NMIP4Config *config) @@ -1685,7 +1685,7 @@ nm_ip4_config_get_direct_route_for_host (const NMIP4Config *config, guint32 host return best_route; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_nameservers (NMIP4Config *config) @@ -1741,7 +1741,7 @@ nm_ip4_config_get_nameserver (const NMIP4Config *config, guint i) return g_array_index (priv->nameservers, guint32, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_domains (NMIP4Config *config) @@ -1798,7 +1798,7 @@ nm_ip4_config_get_domain (const NMIP4Config *config, guint i) return g_ptr_array_index (priv->domains, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_searches (NMIP4Config *config) @@ -1870,7 +1870,7 @@ nm_ip4_config_get_search (const NMIP4Config *config, guint i) return g_ptr_array_index (priv->searches, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_dns_options (NMIP4Config *config) @@ -1927,7 +1927,7 @@ nm_ip4_config_get_dns_option (const NMIP4Config *config, guint i) return g_ptr_array_index (priv->dns_options, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_set_dns_priority (NMIP4Config *config, gint priority) @@ -1948,7 +1948,7 @@ nm_ip4_config_get_dns_priority (const NMIP4Config *config) return priv->dns_priority; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_set_mss (NMIP4Config *config, guint32 mss) @@ -1966,7 +1966,7 @@ nm_ip4_config_get_mss (const NMIP4Config *config) return priv->mss; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_nis_servers (NMIP4Config *config) @@ -2032,7 +2032,7 @@ nm_ip4_config_get_nis_domain (const NMIP4Config *config) return priv->nis_domain; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_reset_wins (NMIP4Config *config) @@ -2088,7 +2088,7 @@ nm_ip4_config_get_wins (const NMIP4Config *config, guint i) return g_array_index (priv->wins, guint32, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_set_mtu (NMIP4Config *config, guint32 mtu, NMIPConfigSource source) @@ -2118,7 +2118,7 @@ nm_ip4_config_get_mtu_source (const NMIP4Config *config) return priv->mtu_source; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip4_config_set_metered (NMIP4Config *config, gboolean metered) @@ -2136,7 +2136,7 @@ nm_ip4_config_get_metered (const NMIP4Config *config) return priv->metered; } -/******************************************************************/ +/*****************************************************************************/ static inline void hash_u32 (GChecksum *sum, guint32 n) @@ -2243,7 +2243,7 @@ nm_ip4_config_equal (const NMIP4Config *a, const NMIP4Config *b) return equal; } -/******************************************************************/ +/*****************************************************************************/ static void nm_ip4_config_init (NMIP4Config *config) diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index f302630a0c..ffcdc9b356 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -163,7 +163,7 @@ gboolean nm_ip4_config_get_metered (const NMIP4Config *config); void nm_ip4_config_hash (const NMIP4Config *config, GChecksum *sum, gboolean dns_only); gboolean nm_ip4_config_equal (const NMIP4Config *a, const NMIP4Config *b); -/******************************************************/ +/*****************************************************************************/ /* Testing-only functions */ gboolean nm_ip4_config_capture_resolv_conf (GArray *nameservers, GPtrArray *dns_options, diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 8002d61a0a..31643c8ed0 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -104,7 +104,7 @@ nm_ip6_config_get_ifindex (const NMIP6Config *config) return NM_IP6_CONFIG_GET_PRIVATE (config)->ifindex; } -/******************************************************************/ +/*****************************************************************************/ /** * nm_ip6_config_capture_resolv_conf(): @@ -639,7 +639,7 @@ nm_ip6_config_create_setting (const NMIP6Config *config) return NM_SETTING (s_ip6); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src, NMIPConfigMergeFlags merge_flags) @@ -730,7 +730,7 @@ nm_ip6_config_destination_is_direct (const NMIP6Config *config, const struct in6 return FALSE; } -/*******************************************************************************/ +/*****************************************************************************/ static int _addresses_get_index (const NMIP6Config *self, const NMPlatformIP6Address *addr) @@ -822,7 +822,7 @@ _dns_options_get_index (const NMIP6Config *self, const char *option) return -1; } -/*******************************************************************************/ +/*****************************************************************************/ /** * nm_ip6_config_subtract: @@ -1222,7 +1222,7 @@ nm_ip6_config_dump (const NMIP6Config *config, const char *detail) g_message (" n-dflt: %d", nm_ip6_config_get_never_default (config)); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_set_never_default (NMIP6Config *config, gboolean never_default) @@ -1273,7 +1273,7 @@ nm_ip6_config_get_route_metric (const NMIP6Config *config) return priv->route_metric; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_reset_addresses (NMIP6Config *config) @@ -1443,7 +1443,7 @@ nm_ip6_config_has_any_dad_pending (const NMIP6Config *self, return FALSE; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_reset_routes (NMIP6Config *config) @@ -1586,7 +1586,7 @@ nm_ip6_config_get_subnet_for_host (const NMIP6Config *config, const struct in6_a } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_reset_nameservers (NMIP6Config *config) @@ -1642,7 +1642,7 @@ nm_ip6_config_get_nameserver (const NMIP6Config *config, guint i) return &g_array_index (priv->nameservers, struct in6_addr, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_reset_domains (NMIP6Config *config) @@ -1699,7 +1699,7 @@ nm_ip6_config_get_domain (const NMIP6Config *config, guint i) return g_ptr_array_index (priv->domains, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_reset_searches (NMIP6Config *config) @@ -1771,7 +1771,7 @@ nm_ip6_config_get_search (const NMIP6Config *config, guint i) return g_ptr_array_index (priv->searches, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_reset_dns_options (NMIP6Config *config) @@ -1828,7 +1828,7 @@ nm_ip6_config_get_dns_option (const NMIP6Config *config, guint i) return g_ptr_array_index (priv->dns_options, i); } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_set_dns_priority (NMIP6Config *config, gint priority) @@ -1849,7 +1849,7 @@ nm_ip6_config_get_dns_priority (const NMIP6Config *config) return priv->dns_priority; } -/******************************************************************/ +/*****************************************************************************/ void nm_ip6_config_set_mss (NMIP6Config *config, guint32 mss) @@ -1867,7 +1867,7 @@ nm_ip6_config_get_mss (const NMIP6Config *config) return priv->mss; } -/******************************************************************/ +/*****************************************************************************/ static inline void hash_u32 (GChecksum *sum, guint32 n) @@ -1972,7 +1972,7 @@ nm_ip6_config_equal (const NMIP6Config *a, const NMIP6Config *b) return equal; } -/******************************************************************/ +/*****************************************************************************/ static void nm_ip6_config_init (NMIP6Config *config) diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index c3f8d9f879..bdcc277df2 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -142,7 +142,7 @@ guint32 nm_ip6_config_get_mss (const NMIP6Config *config); void nm_ip6_config_hash (const NMIP6Config *config, GChecksum *sum, gboolean dns_only); gboolean nm_ip6_config_equal (const NMIP6Config *a, const NMIP6Config *b); -/******************************************************/ +/*****************************************************************************/ /* Testing-only functions */ gboolean nm_ip6_config_capture_resolv_conf (GArray *nameservers, diff --git a/src/nm-logging.c b/src/nm-logging.c index 6ecc160625..1dc9237ae2 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -159,11 +159,11 @@ G_STATIC_ASSERT (sizeof (NMLogDomain) >= sizeof (guint64)); #define LOGD_DHCP_STRING "DHCP" #define LOGD_IP_STRING "IP" -/************************************************************************/ +/*****************************************************************************/ static char *_domains_to_string (gboolean include_level_override); -/************************************************************************/ +/*****************************************************************************/ static gboolean match_log_level (const char *level, @@ -617,7 +617,7 @@ _nm_log_impl (const char *file, g_free (msg); } -/************************************************************************/ +/*****************************************************************************/ static void nm_log_handler (const gchar *log_domain, diff --git a/src/nm-manager.c b/src/nm-manager.c index 9d536e358b..5a20a8be79 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -210,7 +210,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMManager, NM_DEFINE_SINGLETON_INSTANCE (NMManager); -/************************************************************************/ +/*****************************************************************************/ #define _NMLOG_PREFIX_NAME "manager" #define _NMLOG(level, domain, ...) \ @@ -232,7 +232,7 @@ NM_DEFINE_SINGLETON_INSTANCE (NMManager); } \ } G_STMT_END -/************************************************************************/ +/*****************************************************************************/ static void active_connection_state_changed (NMActiveConnection *active, GParamSpec *pspec, @@ -460,7 +460,7 @@ active_connection_get_by_path (NMManager *manager, const char *path) return NULL; } -/************************************************************************/ +/*****************************************************************************/ static void _config_changed_cb (NMConfig *config, NMConfigData *config_data, NMConfigChangeFlags changes, NMConfigData *old_data, NMManager *self) @@ -573,7 +573,7 @@ impl_manager_reload (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_RELOAD, TRUE); } -/************************************************************************/ +/*****************************************************************************/ NMDevice * nm_manager_get_device_by_path (NMManager *manager, const char *path) @@ -1017,7 +1017,7 @@ nm_manager_get_state (NMManager *manager) return NM_MANAGER_GET_PRIVATE (manager)->state; } -/***************************/ +/*****************************************************************************/ static NMDevice * find_parent_device_for_connection (NMManager *self, NMConnection *connection, NMDeviceFactory *cached_factory) @@ -1363,9 +1363,9 @@ system_hostname_changed_cb (NMSettings *settings, nm_dhcp_manager_set_default_hostname (nm_dhcp_manager_get (), priv->hostname); } -/*******************************************************************/ +/*****************************************************************************/ /* General NMManager stuff */ -/*******************************************************************/ +/*****************************************************************************/ static gboolean radio_enabled_for_rstate (RadioState *rstate, gboolean check_changeable) @@ -2025,7 +2025,7 @@ add_device (NMManager *self, NMDevice *device, GError **error) return TRUE; } -/*******************************************************************/ +/*****************************************************************************/ static void factory_device_added_cb (NMDeviceFactory *factory, @@ -2079,7 +2079,7 @@ _register_device_factory (NMDeviceFactory *factory, gpointer user_data) self); } -/*******************************************************************/ +/*****************************************************************************/ static void platform_link_added (NMManager *self, @@ -3450,7 +3450,7 @@ error: return NULL; } -/***********************************************************************/ +/*****************************************************************************/ static void _activation_auth_done (NMActiveConnection *active, @@ -3584,7 +3584,7 @@ error: g_dbus_method_invocation_take_error (context, error); } -/***********************************************************************/ +/*****************************************************************************/ typedef struct { NMManager *manager; @@ -3796,7 +3796,7 @@ error: g_dbus_method_invocation_take_error (context, error); } -/***********************************************************************/ +/*****************************************************************************/ gboolean nm_manager_deactivate_connection (NMManager *manager, @@ -5171,7 +5171,7 @@ prop_filter (GDBusConnection *connection, return NULL; } -/******************************************************************************/ +/*****************************************************************************/ static int _set_prop_filter_free2 (gpointer user_data) @@ -5218,7 +5218,7 @@ _set_prop_filter (NMManager *self, GDBusConnection *connection) } } -/******************************************************************************/ +/*****************************************************************************/ static NMCheckpointManager * _checkpoint_mgr_get (NMManager *self, gboolean create_as_needed) @@ -5386,7 +5386,7 @@ impl_manager_checkpoint_rollback (NMManager *self, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK, TRUE); } -/******************************************************************************/ +/*****************************************************************************/ static void auth_mgr_changed (NMAuthManager *auth_manager, gpointer user_data) @@ -5529,7 +5529,7 @@ dbus_connection_changed_cb (NMBusManager *dbus_mgr, _set_prop_filter (NM_MANAGER (user_data), connection); } -/**********************************************************************/ +/*****************************************************************************/ void nm_manager_set_capability (NMManager *self, @@ -5562,7 +5562,7 @@ nm_manager_set_capability (NMManager *self, _notify (self, PROP_CAPABILITIES); } -/**********************************************************************/ +/*****************************************************************************/ NM_DEFINE_SINGLETON_REGISTER (NMManager); diff --git a/src/nm-multi-index.c b/src/nm-multi-index.c index 6ae54a989b..6ae4c21fab 100644 --- a/src/nm-multi-index.c +++ b/src/nm-multi-index.c @@ -42,7 +42,7 @@ typedef struct { GHashTable *index; } ValuesData; -/******************************************************************************************/ +/*****************************************************************************/ static void _values_data_destroy (ValuesData *values_data) @@ -99,7 +99,7 @@ _values_data_get_data (ValuesData *values_data, NM_SET_OUT (out_data, values_data->values); } -/******************************************************************************************/ +/*****************************************************************************/ /** * nm_multi_index_lookup(): @@ -237,7 +237,7 @@ nm_multi_index_iter_next (NMMultiIndexIter *iter, return FALSE; } -/******************************************************************************************/ +/*****************************************************************************/ void nm_multi_index_id_iter_init (NMMultiIndexIdIter *iter, @@ -283,7 +283,7 @@ nm_multi_index_id_iter_next (NMMultiIndexIdIter *iter, } } -/******************************************************************************************/ +/*****************************************************************************/ static gboolean _do_add (NMMultiIndex *index, @@ -430,7 +430,7 @@ nm_multi_index_move (NMMultiIndex *index, } } -/******************************************************************************************/ +/*****************************************************************************/ guint nm_multi_index_get_num_groups (const NMMultiIndex *index) diff --git a/src/nm-policy.c b/src/nm-policy.c index 682857d3de..8c3db0d202 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1446,7 +1446,7 @@ device_removed (NMManager *manager, NMDevice *device, gpointer user_data) */ } -/**************************************************************************/ +/*****************************************************************************/ static void vpn_connection_activated (NMPolicy *self, NMVpnConnection *vpn) @@ -1595,7 +1595,7 @@ active_connection_removed (NMManager *manager, self); } -/**************************************************************************/ +/*****************************************************************************/ static gboolean schedule_activate_all_cb (gpointer user_data) diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 95113f8c84..d2d376f953 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -79,7 +79,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( NM_DEFINE_SINGLETON_GETTER (NMRouteManager, nm_route_manager_get, NM_TYPE_ROUTE_MANAGER); -/*********************************************************************************************/ +/*****************************************************************************/ typedef struct { const NMPlatformVTableRoute *vt; @@ -112,7 +112,7 @@ static const VTableIP vtable_v4, vtable_v6; return 1; \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_PREFIX_NAME "route-mgr" #undef _NMLOG_ENABLED @@ -144,11 +144,11 @@ static const VTableIP vtable_v4, vtable_v6; } \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ static gboolean _ip4_device_routes_cancel (NMRouteManager *self); -/*********************************************************************************************/ +/*****************************************************************************/ #if NM_MORE_ASSERTS && !defined (G_DISABLE_ASSERT) inline static void @@ -202,7 +202,7 @@ ASSERT_route_index_valid (const VTableIP *vtable, const GArray *entries, const R #define ASSERT_route_index_valid(vtable, entries, index, unique_ifindexes) G_STMT_START { (void) 0; } G_STMT_END #endif -/*********************************************************************************************/ +/*****************************************************************************/ static int _v4_route_dest_cmp (const NMPlatformIP4Route *r1, const NMPlatformIP4Route *r2) @@ -254,7 +254,7 @@ _v6_route_id_cmp (const NMPlatformIP6Route *r1, const NMPlatformIP6Route *r2) return 0; } -/*********************************************************************************************/ +/*****************************************************************************/ static int _route_index_create_sort (const NMPlatformIPXRoute **p1, const NMPlatformIPXRoute ** p2, const VTableIP *vtable) @@ -340,7 +340,7 @@ _route_index_reverse_idx (const VTableIP *vtable, const RouteIndex *index, guint return offset; } -/*********************************************************************************************/ +/*****************************************************************************/ static gboolean _route_equals_ignoring_ifindex (const VTableIP *vtable, const NMPlatformIPXRoute *r1, const NMPlatformIPXRoute *r2, gint64 r2_metric) @@ -431,7 +431,7 @@ _sort_indexes_cmp (guint *a, guint *b) g_return_val_if_reached (0); } -/*********************************************************************************************/ +/*****************************************************************************/ static gboolean _vx_route_sync (const VTableIP *vtable, NMRouteManager *self, int ifindex, const GArray *known_routes, gboolean ignore_kernel_routes, gboolean full_sync) @@ -951,7 +951,7 @@ nm_route_manager_route_flush (NMRouteManager *self, int ifindex) return success; } -/*********************************************************************************************/ +/*****************************************************************************/ static gboolean _ip4_device_routes_entry_expired (const IP4DeviceRoutePurgeEntry *entry, gint64 now) @@ -1126,7 +1126,7 @@ nm_route_manager_ip4_route_register_device_route_purge_list (NMRouteManager *sel } } -/*********************************************************************************************/ +/*****************************************************************************/ static const VTableIP vtable_v4 = { .vt = &nm_platform_vtable_route_v4, @@ -1140,7 +1140,7 @@ static const VTableIP vtable_v6 = { .route_id_cmp = (int (*) (const NMPlatformIPXRoute *, const NMPlatformIPXRoute *)) _v6_route_id_cmp, }; -/*********************************************************************************************/ +/*****************************************************************************/ static void set_property (GObject *object, guint prop_id, diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c index 279a888672..19d4688bb4 100644 --- a/src/nm-session-monitor.c +++ b/src/nm-session-monitor.c @@ -33,7 +33,7 @@ #include <systemd/sd-login.h> #endif -/********************************************************************/ +/*****************************************************************************/ /* <internal> * SECTION:nm-session-monitor @@ -76,7 +76,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -/********************************************************************/ +/*****************************************************************************/ #ifdef SESSION_TRACKING_SYSTEMD static gboolean @@ -136,7 +136,7 @@ st_sd_finalize (NMSessionMonitor *monitor) } #endif /* SESSION_TRACKING_SYSTEMD */ -/********************************************************************/ +/*****************************************************************************/ #ifdef SESSION_TRACKING_CONSOLEKIT typedef struct { @@ -274,7 +274,7 @@ ck_finalize (NMSessionMonitor *monitor) } #endif /* SESSION_TRACKING_CONSOLEKIT */ -/********************************************************************/ +/*****************************************************************************/ NM_DEFINE_SINGLETON_GETTER (NMSessionMonitor, nm_session_monitor_get, NM_TYPE_SESSION_MONITOR); @@ -356,7 +356,7 @@ nm_session_monitor_session_exists (NMSessionMonitor *self, return FALSE; } -/********************************************************************/ +/*****************************************************************************/ static void nm_session_monitor_init (NMSessionMonitor *monitor) diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 8a4f69b69e..4af847221a 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -36,7 +36,7 @@ #include "nm-test-utils-core.h" -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_PREFIX_NAME "platform-fake" #define _NMLOG_DOMAIN LOGD_PLATFORM @@ -62,7 +62,7 @@ } \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ typedef struct { GHashTable *options; @@ -85,7 +85,7 @@ typedef struct { G_DEFINE_TYPE (NMFakePlatform, nm_fake_platform, NM_TYPE_PLATFORM) -/******************************************************************/ +/*****************************************************************************/ static void link_changed (NMPlatform *platform, NMFakePlatformLink *device, gboolean raise_signal); @@ -99,7 +99,7 @@ static gboolean ip6_address_add (NMPlatform *platform, guint flags); static gboolean ip6_address_delete (NMPlatform *platform, int ifindex, struct in6_addr addr, guint8 plen); -/******************************************************************/ +/*****************************************************************************/ static gboolean _ip4_address_equal_peer_net (in_addr_t peer1, in_addr_t peer2, guint8 plen) @@ -107,7 +107,7 @@ _ip4_address_equal_peer_net (in_addr_t peer1, in_addr_t peer2, guint8 plen) return ((peer1 ^ peer2) & nm_utils_ip4_prefix_to_netmask (plen)) == 0; } -/******************************************************************/ +/*****************************************************************************/ static gboolean sysctl_set (NMPlatform *platform, const char *path, const char *value) @@ -839,7 +839,7 @@ mesh_set_ssid (NMPlatform *platform, int ifindex, const guint8 *ssid, gsize len) return FALSE; } -/******************************************************************/ +/*****************************************************************************/ static GArray * ip4_address_get_all (NMPlatform *platform, int ifindex) @@ -1081,7 +1081,7 @@ ip6_address_get (NMPlatform *platform, int ifindex, struct in6_addr addr, guint8 return NULL; } -/******************************************************************/ +/*****************************************************************************/ static GArray * ip4_route_get_all (NMPlatform *platform, int ifindex, NMPlatformGetRouteFlags flags) @@ -1367,7 +1367,7 @@ ip6_route_get (NMPlatform *platform, int ifindex, struct in6_addr network, guint return NULL; } -/******************************************************************/ +/*****************************************************************************/ static void nm_fake_platform_init (NMFakePlatform *fake_platform) diff --git a/src/platform/nm-fake-platform.h b/src/platform/nm-fake-platform.h index 53a2ff1a6a..044ee72c1a 100644 --- a/src/platform/nm-fake-platform.h +++ b/src/platform/nm-fake-platform.h @@ -30,7 +30,7 @@ #define NM_IS_FAKE_PLATFORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_FAKE_PLATFORM)) #define NM_FAKE_PLATFORM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_FAKE_PLATFORM, NMFakePlatformClass)) -/******************************************************************/ +/*****************************************************************************/ typedef struct { NMPlatform parent; @@ -40,7 +40,7 @@ typedef struct { NMPlatformClass parent; } NMFakePlatformClass; -/******************************************************************/ +/*****************************************************************************/ GType nm_fake_platform_get_type (void); diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index cedc220a75..ec9aa38aaa 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -62,11 +62,11 @@ /* nm-internal error codes for libnl. Make sure they don't overlap. */ #define _NLE_NM_NOBUFS 500 -/*********************************************************************************************/ +/*****************************************************************************/ #define IFQDISCSIZ 32 -/*********************************************************************************************/ +/*****************************************************************************/ #ifndef IFLA_PROMISCUITY #define IFLA_PROMISCUITY 30 @@ -114,7 +114,7 @@ #define IP6_FLOWINFO_TCLASS_SHIFT 20 #define IP6_FLOWINFO_FLOWLABEL_MASK 0x000FFFFF -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_PREFIX_NAME "platform-linux" #define _NMLOG_DOMAIN LOGD_PLATFORM @@ -550,7 +550,7 @@ _addrtime_get_lifetimes (guint32 timestamp, *out_preferred = preferred; } -/******************************************************************/ +/*****************************************************************************/ static const NMPObject * _lookup_cached_link (const NMPCache *cache, int ifindex, gboolean *completed_from_cache, const NMPObject **link_cached) @@ -571,7 +571,7 @@ _lookup_cached_link (const NMPCache *cache, int ifindex, gboolean *completed_fro return *link_cached; } -/******************************************************************/ +/*****************************************************************************/ #define DEVTYPE_PREFIX "DEVTYPE=" @@ -1975,7 +1975,7 @@ nmp_object_new_from_nl (NMPlatform *platform, const NMPCache *cache, struct nl_m } } -/******************************************************************/ +/*****************************************************************************/ static gboolean _nl_msg_new_link_set_afspec (struct nl_msg *msg, @@ -2352,7 +2352,7 @@ nla_put_failure: g_return_val_if_reached (NULL); } -/******************************************************************/ +/*****************************************************************************/ static int _support_kernel_extended_ifa_flags = -1; @@ -2471,7 +2471,7 @@ nm_linux_platform_setup (void) NULL); } -/******************************************************************/ +/*****************************************************************************/ static void _assert_netns_current (NMPlatform *platform) @@ -2703,7 +2703,7 @@ sysctl_get (NMPlatform *platform, const char *path) return contents; } -/******************************************************************/ +/*****************************************************************************/ static gboolean check_support_kernel_extended_ifa_flags (NMPlatform *platform) @@ -2727,14 +2727,14 @@ process_events (NMPlatform *platform) delayed_action_handle_all (platform, TRUE); } -/******************************************************************/ +/*****************************************************************************/ #define cache_lookup_all_objects(type, platform, obj_type, visible_only) \ ((const type *const*) nmp_cache_lookup_multi (NM_LINUX_PLATFORM_GET_PRIVATE ((platform))->cache, \ nmp_cache_id_init_object_type (NMP_CACHE_ID_STATIC, (obj_type), (visible_only)), \ NULL)) -/******************************************************************/ +/*****************************************************************************/ static void do_emit_signal (NMPlatform *platform, const NMPObject *obj, NMPCacheOpsType cache_op, gboolean was_visible) @@ -2804,7 +2804,7 @@ do_emit_signal (NMPlatform *platform, const NMPObject *obj, NMPCacheOpsType cach (NMPlatformSignalChangeType) cache_op); } -/******************************************************************/ +/*****************************************************************************/ _NM_UTILS_LOOKUP_DEFINE (static, delayed_action_refresh_from_object_type, NMPObjectType, DelayedActionType, NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT (DELAYED_ACTION_TYPE_NONE), @@ -3163,7 +3163,7 @@ delayed_action_schedule_WAIT_FOR_NL_RESPONSE (NMPlatform *platform, &data); } -/******************************************************************/ +/*****************************************************************************/ static void cache_prune_candidates_record_all (NMPlatform *platform, NMPObjectType obj_type) @@ -3509,7 +3509,7 @@ cache_post (NMPlatform *platform, } } -/******************************************************************/ +/*****************************************************************************/ static int _nl_send_auto_with_seq (NMPlatform *platform, @@ -3771,7 +3771,7 @@ event_valid_msg (NMPlatform *platform, struct nl_msg *msg, gboolean handle_event cache_prune_candidates_drop (platform, obj_cache); } -/******************************************************************/ +/*****************************************************************************/ static const NMPObject * cache_lookup_link (NMPlatform *platform, int ifindex) @@ -5224,7 +5224,7 @@ link_release (NMPlatform *platform, int master, int slave) return link_enslave (platform, 0, slave); } -/******************************************************************/ +/*****************************************************************************/ static gboolean _infiniband_partition_action (NMPlatform *platform, @@ -5290,7 +5290,7 @@ infiniband_partition_delete (NMPlatform *platform, int parent, int p_key) return _infiniband_partition_action (platform, INFINIBAND_ACTION_DELETE_CHILD, parent, p_key, NULL); } -/******************************************************************/ +/*****************************************************************************/ static WifiData * wifi_get_wifi_data (NMPlatform *platform, int ifindex) @@ -5421,7 +5421,7 @@ wifi_indicate_addressing_running (NMPlatform *platform, int ifindex, gboolean ru wifi_utils_indicate_addressing_running (wifi_data, running); } -/******************************************************************/ +/*****************************************************************************/ static gboolean link_can_assume (NMPlatform *platform, int ifindex) @@ -5464,7 +5464,7 @@ link_can_assume (NMPlatform *platform, int ifindex) return FALSE; } -/******************************************************************/ +/*****************************************************************************/ static guint32 mesh_get_channel (NMPlatform *platform, int ifindex) @@ -5487,7 +5487,7 @@ mesh_set_ssid (NMPlatform *platform, int ifindex, const guint8 *ssid, gsize len) return wifi_utils_set_mesh_ssid (wifi_data, ssid, len); } -/******************************************************************/ +/*****************************************************************************/ static gboolean link_get_wake_on_lan (NMPlatform *platform, int ifindex) @@ -5529,7 +5529,7 @@ link_get_driver_info (NMPlatform *platform, out_fw_version); } -/******************************************************************/ +/*****************************************************************************/ static GArray * ipx_address_get_all (NMPlatform *platform, int ifindex, NMPObjectType obj_type) @@ -5694,7 +5694,7 @@ ip6_address_get (NMPlatform *platform, int ifindex, struct in6_addr addr, guint8 return NULL; } -/******************************************************************/ +/*****************************************************************************/ static GArray * ipx_route_get_all (NMPlatform *platform, int ifindex, NMPObjectType obj_type, NMPlatformGetRouteFlags flags) @@ -5909,7 +5909,7 @@ ip6_route_get (NMPlatform *platform, int ifindex, struct in6_addr network, guint return NULL; } -/******************************************************************/ +/*****************************************************************************/ #define EVENT_CONDITIONS ((GIOCondition) (G_IO_IN | G_IO_PRI)) #define ERROR_CONDITIONS ((GIOCondition) (G_IO_ERR | G_IO_NVAL)) @@ -6236,7 +6236,7 @@ after_read: } } -/******************************************************************/ +/*****************************************************************************/ static void cache_update_link_udev (NMPlatform *platform, int ifindex, GUdevDevice *udev_device) @@ -6352,7 +6352,7 @@ handle_udev_event (GUdevClient *client, udev_device_removed (platform, udev_device); } -/******************************************************************/ +/*****************************************************************************/ static void nm_linux_platform_init (NMLinuxPlatform *self) diff --git a/src/platform/nm-linux-platform.h b/src/platform/nm-linux-platform.h index 3b2a440e52..becdb2db2a 100644 --- a/src/platform/nm-linux-platform.h +++ b/src/platform/nm-linux-platform.h @@ -30,7 +30,7 @@ #define NM_IS_LINUX_PLATFORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_LINUX_PLATFORM)) #define NM_LINUX_PLATFORM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_LINUX_PLATFORM, NMLinuxPlatformClass)) -/******************************************************************/ +/*****************************************************************************/ struct _NMLinuxPlatformPrivate; @@ -44,7 +44,7 @@ typedef struct { NMPlatformClass parent; } NMLinuxPlatformClass; -/******************************************************************/ +/*****************************************************************************/ GType nm_linux_platform_get_type (void); diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 9dace69984..c6943cd98c 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -97,7 +97,7 @@ typedef struct { gboolean register_singleton; } NMPlatformPrivate; -/******************************************************************/ +/*****************************************************************************/ guint _nm_platform_signal_id_get (NMPlatformSignalIdType signal_type) @@ -109,7 +109,7 @@ _nm_platform_signal_id_get (NMPlatformSignalIdType signal_type) return signals[signal_type]; } -/******************************************************************/ +/*****************************************************************************/ /* Singleton NMPlatform subclass instance and cached class object */ NM_DEFINE_SINGLETON_INSTANCE (NMPlatform); @@ -184,7 +184,7 @@ nm_platform_try_get (void) return singleton_instance; } -/******************************************************************/ +/*****************************************************************************/ /** * _nm_platform_error_to_string: @@ -209,7 +209,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (_nm_platform_error_to_string, NMPlatformError, NM_UTILS_LOOKUP_ITEM_IGNORE (_NM_PLATFORM_ERROR_MININT), ); -/******************************************************************/ +/*****************************************************************************/ gboolean nm_platform_check_support_kernel_extended_ifa_flags (NMPlatform *self) @@ -254,7 +254,7 @@ nm_platform_process_events (NMPlatform *self) klass->process_events (self); } -/******************************************************************/ +/*****************************************************************************/ /** * nm_platform_sysctl_set: @@ -386,7 +386,7 @@ nm_platform_sysctl_get_int_checked (NMPlatform *self, const char *path, guint ba return ret; } -/******************************************************************/ +/*****************************************************************************/ static int _link_get_all_presort (gconstpointer p_a, @@ -1764,7 +1764,7 @@ nm_platform_sysctl_slave_get_option (NMPlatform *self, int ifindex, const char * return link_get_option (self, ifindex, slave_category (self, ifindex), option); } -/******************************************************************************/ +/*****************************************************************************/ gboolean nm_platform_link_vlan_change (NMPlatform *self, @@ -2467,7 +2467,7 @@ _to_string_ifa_flags (guint32 ifa_flags, char *buf, gsize size) return buf; } -/******************************************************************/ +/*****************************************************************************/ gboolean nm_platform_ethtool_set_wake_on_lan (NMPlatform *self, const char *ifname, NMSettingWiredWakeOnLan wol, const char *wol_password) @@ -2493,7 +2493,7 @@ nm_platform_ethtool_get_link_speed (NMPlatform *self, const char *ifname, guint3 return nmp_utils_ethtool_get_link_speed (ifname, out_speed); } -/******************************************************************/ +/*****************************************************************************/ void nm_platform_ip4_address_set_addr (NMPlatformIP4Address *addr, in_addr_t address, guint8 plen) @@ -2838,7 +2838,7 @@ nm_platform_address_flush (NMPlatform *self, int ifindex) && nm_platform_ip6_address_sync (self, ifindex, NULL, FALSE); } -/******************************************************************/ +/*****************************************************************************/ GArray * nm_platform_ip4_route_get_all (NMPlatform *self, int ifindex, NMPlatformGetRouteFlags flags) @@ -2986,7 +2986,7 @@ nm_platform_ip6_route_get (NMPlatform *self, int ifindex, struct in6_addr networ return klass->ip6_route_get (self, ifindex, network, plen, metric); } -/******************************************************************/ +/*****************************************************************************/ const char * nm_platform_vlan_qos_mapping_to_string (const char *name, @@ -4083,7 +4083,7 @@ log_ip6_route (NMPlatform *self, NMPObjectType obj_type, int ifindex, NMPlatform _LOGD ("signal: route 6 %7s: %s", nm_platform_signal_change_type_to_string (change_type), nm_platform_ip6_route_to_string (route, NULL, 0)); } -/******************************************************************/ +/*****************************************************************************/ NMPNetns * nm_platform_netns_get (NMPlatform *self) @@ -4108,7 +4108,7 @@ nm_platform_netns_push (NMPlatform *platform, NMPNetns **netns) return TRUE; } -/******************************************************************/ +/*****************************************************************************/ static gboolean _vtr_v4_route_add (NMPlatform *self, int ifindex, const NMPlatformIPXRoute *route, gint64 metric) @@ -4175,7 +4175,7 @@ _vtr_v6_route_delete_default (NMPlatform *self, int ifindex, guint32 metric) return nm_platform_ip6_route_delete (self, ifindex, in6addr_any, 0, metric); } -/******************************************************************/ +/*****************************************************************************/ const NMPlatformVTableRoute nm_platform_vtable_route_v4 = { .is_ip4 = TRUE, @@ -4203,7 +4203,7 @@ const NMPlatformVTableRoute nm_platform_vtable_route_v6 = { .metric_normalize = nm_utils_ip6_route_metric_normalize, }; -/******************************************************************/ +/*****************************************************************************/ static void set_property (GObject *object, guint prop_id, diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index fc6965e904..edb9328618 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -42,12 +42,12 @@ #define NM_PLATFORM_NETNS_SUPPORT_DEFAULT FALSE -/******************************************************************/ +/*****************************************************************************/ #define NM_PLATFORM_NETNS_SUPPORT "netns-support" #define NM_PLATFORM_REGISTER_SINGLETON "register-singleton" -/******************************************************************/ +/*****************************************************************************/ /* workaround for older libnl version, that does not define these flags. */ #ifndef IFA_F_MANAGETEMPADDR @@ -481,7 +481,7 @@ typedef struct { bool multi_queue:1; } NMPlatformTunProperties; -/******************************************************************/ +/*****************************************************************************/ struct _NMPlatform { GObject parent; @@ -672,7 +672,7 @@ typedef struct { const char *nm_platform_signal_change_type_to_string (NMPlatformSignalChangeType change_type); -/******************************************************************/ +/*****************************************************************************/ GType nm_platform_get_type (void); @@ -682,7 +682,7 @@ NMPlatform *nm_platform_try_get (void); #define NM_PLATFORM_GET (nm_platform_get ()) -/******************************************************************/ +/*****************************************************************************/ /** * nm_platform_route_scope_inv: diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c index 26295855d8..cf4c64bf85 100644 --- a/src/platform/nmp-netns.c +++ b/src/platform/nmp-netns.c @@ -63,7 +63,7 @@ __ns_types_to_str (int ns_types, int ns_types_already_set, char *buf, gsize len) #define _ns_types_to_str(ns_types, ns_types_already_set, buf) \ __ns_types_to_str (ns_types, ns_types_already_set, buf, sizeof (buf)) -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_PLATFORM #define _NMLOG_PREFIX_NAME "netns" @@ -83,7 +83,7 @@ __ns_types_to_str (int ns_types, int ns_types_already_set, char *buf, gsize len) } \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( PROP_FD_NET, @@ -106,7 +106,7 @@ typedef struct { static void _stack_push (NMPNetns *netns, int ns_types); static NMPNetns *_netns_new (GError **error); -/*********************************************************************************************/ +/*****************************************************************************/ static GArray *netns_stack = NULL; @@ -262,13 +262,13 @@ _stack_size (void) return netns_stack->len; } -/*********************************************************************************************/ +/*****************************************************************************/ G_DEFINE_TYPE (NMPNetns, nmp_netns, G_TYPE_OBJECT); #define NMP_NETNS_GET_PRIVATE(o) ((o)->priv) -/*********************************************************************************************/ +/*****************************************************************************/ static NMPNetns * _netns_new (GError **error) @@ -390,7 +390,7 @@ _netns_switch_pop (NMPNetns *self, int ns_types) return success; } -/*********************************************************************************************/ +/*****************************************************************************/ int nmp_netns_get_fd_net (NMPNetns *self) @@ -408,7 +408,7 @@ nmp_netns_get_fd_mnt (NMPNetns *self) return self->priv->fd_mnt; } -/*********************************************************************************************/ +/*****************************************************************************/ static gboolean _nmp_netns_push_type (NMPNetns *self, int ns_types) @@ -579,7 +579,7 @@ nmp_netns_is_initial (void) return nmp_netns_get_current () == nmp_netns_get_initial (); } -/*********************************************************************************************/ +/*****************************************************************************/ gboolean nmp_netns_bind_to_path (NMPNetns *self, const char *filename, int *out_fd) @@ -657,7 +657,7 @@ nmp_netns_bind_to_path_destroy (NMPNetns *self, const char *filename) return TRUE; } -/******************************************************************************/ +/*****************************************************************************/ static void set_property (GObject *object, guint prop_id, diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 30a52c259b..0bcbe2afcf 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -29,7 +29,7 @@ #include "nm-core-utils.h" #include "nm-platform-utils.h" -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_PLATFORM #define _NMLOG(level, obj, ...) \ @@ -51,7 +51,7 @@ * Disabled by default. */ #define _LOGr(...) G_STMT_START { if (FALSE) { _LOGt (__VA_ARGS__); } } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ struct _NMPCache { /* the cache contains only one hash table for all object types, and similarly @@ -74,7 +74,7 @@ struct _NMPCache { gboolean use_udev; }; -/******************************************************************/ +/*****************************************************************************/ static inline guint _id_hash_ip6_addr (const struct in6_addr *addr) @@ -121,7 +121,7 @@ _vlan_xgress_qos_mappings_cpy (guint *dst_n_map, } } -/******************************************************************/ +/*****************************************************************************/ static const char * _link_get_driver (GUdevDevice *udev_device, const char *kind, const char *ifname) @@ -196,7 +196,7 @@ _nmp_object_fixup_link_master_connected (NMPObject *obj, const NMPCache *cache) obj->link.connected = !obj->link.connected; } -/******************************************************************/ +/*****************************************************************************/ const NMPClass * nmp_class_from_type (NMPObjectType obj_type) @@ -206,7 +206,7 @@ nmp_class_from_type (NMPObjectType obj_type) return &_nmp_classes[obj_type - 1]; } -/******************************************************************/ +/*****************************************************************************/ NMPObject * nmp_object_ref (NMPObject *obj) @@ -292,7 +292,7 @@ nmp_object_new_link (int ifindex) return obj; } -/******************************************************************/ +/*****************************************************************************/ static const NMPObject * _nmp_object_stackinit_from_class (NMPObject *obj, const NMPClass *klass) @@ -415,7 +415,7 @@ _vt_cmd_obj_stackinit_id_ip6_route (NMPObject *obj, const NMPObject *src) nmp_object_stackinit_id_ip6_route (obj, src->ip_route.ifindex, &src->ip6_route.network, src->ip_route.plen, src->ip_route.metric); } -/******************************************************************/ +/*****************************************************************************/ const char * nmp_object_to_string (const NMPObject *obj, NMPObjectToStringMode to_string_mode, char *buf, gsize buf_size) @@ -954,7 +954,7 @@ _vt_cmd_obj_is_visible_link (const NMPObject *obj) && obj->link.name[0]; } -/******************************************************************/ +/*****************************************************************************/ #define _STRUCT_SIZE(struct_type, field) \ (G_STRUCT_OFFSET (struct_type, field) + sizeof (((struct_type *) NULL)->field)) @@ -1021,7 +1021,7 @@ nmp_cache_id_destroy (NMPCacheId *id) g_slice_free1 (n, id); } -/******************************************************************/ +/*****************************************************************************/ NMPCacheId _nmp_cache_id_static; @@ -1143,7 +1143,7 @@ nmp_cache_id_init_routes_by_destination_ip6 (NMPCacheId *id, return id; } -/******************************************************************/ +/*****************************************************************************/ static gboolean _nmp_object_init_cache_id (const NMPObject *obj, NMPCacheIdType id_type, NMPCacheId *id, const NMPCacheId **out_id) @@ -1301,7 +1301,7 @@ _vt_cmd_obj_init_cache_id_ipx_route (const NMPObject *obj, NMPCacheIdType id_typ return TRUE; } -/******************************************************************/ +/*****************************************************************************/ gboolean nmp_cache_use_udev_get (const NMPCache *cache) @@ -1311,7 +1311,7 @@ nmp_cache_use_udev_get (const NMPCache *cache) return cache->use_udev; } -/******************************************************************/ +/*****************************************************************************/ /** * nmp_cache_link_connected_needs_toggle: @@ -1416,7 +1416,7 @@ nmp_cache_link_connected_needs_toggle_by_ifindex (const NMPCache *cache, int mas return NULL; } -/******************************************************************/ +/*****************************************************************************/ const NMPlatformObject *const * nmp_cache_lookup_multi (const NMPCache *cache, const NMPCacheId *cache_id, guint *out_len) @@ -1581,7 +1581,7 @@ nmp_cache_lookup_all_to_hash (const NMPCache *cache, return hash; } -/******************************************************************/ +/*****************************************************************************/ static void _nmp_cache_update_cache (NMPCache *cache, NMPObject *obj, gboolean remove) @@ -1993,7 +1993,7 @@ nmp_cache_update_link_master_connected (NMPCache *cache, int ifindex, NMPObject return NMP_CACHE_OPS_UPDATED; } -/******************************************************************/ +/*****************************************************************************/ NMPCache * nmp_cache_new (gboolean use_udev) @@ -2034,7 +2034,7 @@ nmp_cache_free (NMPCache *cache) g_free (cache); } -/******************************************************************/ +/*****************************************************************************/ void ASSERT_nmp_cache_is_consistent (const NMPCache *cache) @@ -2092,7 +2092,7 @@ ASSERT_nmp_cache_is_consistent (const NMPCache *cache) } #endif } -/******************************************************************/ +/*****************************************************************************/ const NMPClass _nmp_classes[NMP_OBJECT_TYPE_MAX] = { [NMP_OBJECT_TYPE_LINK - 1] = { diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index 87fccee234..153592cf3c 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -12,7 +12,7 @@ #define DEVICE_NAME "nm-test-device" -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_PREFIX_NAME "platform-test" #define _NMLOG_DOMAIN LOGD_PLATFORM @@ -35,12 +35,12 @@ } \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ gboolean nmtstp_is_root_test (void); gboolean nmtstp_is_sysfs_writable (void); -/******************************************************************************/ +/*****************************************************************************/ typedef struct _NMTstpNamespaceHandle NMTstpNamespaceHandle; @@ -51,7 +51,7 @@ pid_t nmtstp_namespace_handle_get_pid (NMTstpNamespaceHandle *handle); int nmtstp_namespace_get_fd_for_process (pid_t pid, const char *ns_name); -/******************************************************************************/ +/*****************************************************************************/ typedef struct { gulong handler_id; diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-general.c index f67f00892f..c67f2e0410 100644 --- a/src/platform/tests/test-general.c +++ b/src/platform/tests/test-general.c @@ -28,7 +28,7 @@ #include "nm-test-utils-core.h" -/******************************************************************/ +/*****************************************************************************/ static void test_init_linux_platform (void) @@ -38,7 +38,7 @@ test_init_linux_platform (void) platform = nm_linux_platform_new (NM_PLATFORM_NETNS_SUPPORT_DEFAULT); } -/******************************************************************/ +/*****************************************************************************/ static void test_link_get_all (void) @@ -51,7 +51,7 @@ test_link_get_all (void) links = nm_platform_link_get_all (platform); } -/******************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index e242a71f11..8a784cf05e 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -1870,7 +1870,7 @@ again: nmtstp_link_del (NULL, -1, ifindex_dummy0, IFACE_DUMMY0); } -/******************************************************************/ +/*****************************************************************************/ static void _test_netns_setup (gpointer fixture, gconstpointer test_data) @@ -1933,7 +1933,7 @@ _test_netns_check_skip (void) return FALSE; } -/******************************************************************/ +/*****************************************************************************/ #define _sysctl_assert_eq(plat, path, value) \ G_STMT_START { \ diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c index 9d4f69de4c..ccc256ada7 100644 --- a/src/platform/tests/test-nmp-object.c +++ b/src/platform/tests/test-nmp-object.c @@ -28,7 +28,7 @@ struct { GList *udev_devices; } global; -/******************************************************************/ +/*****************************************************************************/ static gboolean _nmp_object_id_equal (const NMPObject *a, const NMPObject *b) @@ -50,7 +50,7 @@ _nmp_object_equal (const NMPObject *a, const NMPObject *b) } #define nmp_object_equal _nmp_object_equal -/******************************************************************/ +/*****************************************************************************/ static void _assert_cache_multi_lookup_contains (const NMPCache *cache, const NMPCacheId *cache_id, const NMPObject *obj, gboolean contains) @@ -85,7 +85,7 @@ _assert_cache_multi_lookup_contains (const NMPCache *cache, const NMPCacheId *ca g_assert (!!contains == found); } -/******************************************************************/ +/*****************************************************************************/ typedef struct { NMPCache *cache; @@ -382,7 +382,7 @@ test_cache_link (void) nmp_cache_free (cache); } -/******************************************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c index af285b45c3..002ac6aae6 100644 --- a/src/platform/wifi/wifi-utils-wext.c +++ b/src/platform/wifi/wifi-utils-wext.c @@ -369,7 +369,7 @@ wifi_wext_get_qual (WifiData *data) return wext_qual_to_percent (&stats.qual, &wext->max_qual); } -/*********************/ +/*****************************************************************************/ /* OLPC Mesh-only functions */ static guint32 @@ -441,7 +441,7 @@ wifi_wext_set_mesh_ssid (WifiData *data, const guint8 *ssid, gsize len) return FALSE; } -/*********************/ +/*****************************************************************************/ static gboolean wext_can_scan (WifiDataWext *wext) diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c index b7fe86bbe1..de858e499a 100644 --- a/src/platform/wifi/wifi-utils.c +++ b/src/platform/wifi/wifi-utils.c @@ -53,7 +53,7 @@ wifi_data_free (WifiData *data) g_free (data); } -/***************************************************************/ +/*****************************************************************************/ WifiData * wifi_utils_init (const char *iface, int ifindex, gboolean check_scan) diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index a51f7cfa6c..a53891c4d7 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -178,7 +178,7 @@ nm_ppp_manager_new (const char *iface) NULL); } -/*******************************************/ +/*****************************************************************************/ static gboolean monitor_cb (gpointer user_data) @@ -224,7 +224,7 @@ monitor_stats (NMPPPManager *manager) _LOGW ("could not monitor PPP stats: %s", strerror (errno)); } -/*******************************************/ +/*****************************************************************************/ static void remove_timeout_handler (NMPPPManager *manager) @@ -657,7 +657,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class) NULL); } -/*******************************************/ +/*****************************************************************************/ @@ -714,7 +714,7 @@ nm_cmd_line_add_int (NMCmdLine *cmd, int i) g_free (str); } -/*******************************************/ +/*****************************************************************************/ static void ppp_exit_code (guint pppd_exit_status, GPid pid) @@ -1148,7 +1148,7 @@ _ppp_cleanup (NMPPPManager *manager) nm_clear_g_source (&priv->ppp_watch_id); } -/***********************************************************/ +/*****************************************************************************/ typedef struct { NMPPPManager *manager; diff --git a/src/rdisc/nm-fake-rdisc.c b/src/rdisc/nm-fake-rdisc.c index 46f2b08cf1..6d8c696224 100644 --- a/src/rdisc/nm-fake-rdisc.c +++ b/src/rdisc/nm-fake-rdisc.c @@ -66,7 +66,7 @@ enum { }; static guint signals[LAST_SIGNAL] = { 0 }; -/******************************************************************/ +/*****************************************************************************/ static void fake_ra_free (gpointer data) @@ -218,7 +218,7 @@ nm_fake_rdisc_done (NMFakeRDisc *self) return !NM_FAKE_RDISC_GET_PRIVATE (self)->ras; } -/******************************************************************/ +/*****************************************************************************/ static gboolean send_rs (NMRDisc *rdisc, GError **error) @@ -346,7 +346,7 @@ nm_fake_rdisc_emit_new_ras (NMFakeRDisc *self) start (NM_RDISC (self)); } -/******************************************************************/ +/*****************************************************************************/ NMRDisc * nm_fake_rdisc_new (int ifindex, const char *ifname) diff --git a/src/rdisc/nm-fake-rdisc.h b/src/rdisc/nm-fake-rdisc.h index 1082ba5ef1..27557e9d72 100644 --- a/src/rdisc/nm-fake-rdisc.h +++ b/src/rdisc/nm-fake-rdisc.h @@ -40,7 +40,7 @@ typedef struct { NMRDiscClass parent; } NMFakeRDiscClass; -/******************************************************************/ +/*****************************************************************************/ GType nm_fake_rdisc_get_type (void); diff --git a/src/rdisc/nm-rdisc-private.h b/src/rdisc/nm-rdisc-private.h index abc5a399b9..cc2f1ae10d 100644 --- a/src/rdisc/nm-rdisc-private.h +++ b/src/rdisc/nm-rdisc-private.h @@ -44,7 +44,7 @@ gboolean nm_rdisc_add_route (NMRDisc *rdisc, const NMRDiscRoute * gboolean nm_rdisc_add_dns_server (NMRDisc *rdisc, const NMRDiscDNSServer *new); gboolean nm_rdisc_add_dns_domain (NMRDisc *rdisc, const NMRDiscDNSDomain *new); -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_IP6 #define _NMLOG(level, ...) _LOG(level, _NMLOG_DOMAIN, rdisc, __VA_ARGS__) @@ -72,6 +72,6 @@ gboolean nm_rdisc_add_dns_domain (NMRDisc *rdisc, const NMRDiscDNSDoma } \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ #endif /* __NETWORKMANAGER_RDISC_PRIVATE_H__ */ diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index 3bc697504a..c7437a106c 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -423,7 +423,7 @@ nm_rdisc_add_dns_domain (NMRDisc *rdisc, const NMRDiscDNSDomain *new) return !!new->lifetime; } -/******************************************************************/ +/*****************************************************************************/ /** * nm_rdisc_set_iid: @@ -857,7 +857,7 @@ nm_rdisc_ra_received (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap changed) check_timestamps (rdisc, now, changed); } -/******************************************************************/ +/*****************************************************************************/ static void dns_domain_free (gpointer data) diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 54ca2f55c5..46378ffeca 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -138,7 +138,7 @@ static void _con_del_request_start (Request *req); static gboolean _con_get_try_complete_early (Request *req); -/*************************************************************/ +/*****************************************************************************/ static gboolean remove_agent (NMAgentManager *self, const char *owner) @@ -186,7 +186,7 @@ maybe_remove_agent_on_error (NMSecretAgent *agent, remove_agent (nm_agent_manager_get (), nm_secret_agent_get_dbus_owner (agent)); } -/*************************************************************/ +/*****************************************************************************/ static gboolean validate_identifier (const char *identifier, GError **error) @@ -433,7 +433,7 @@ done: g_free (sender); } -/*************************************************************/ +/*****************************************************************************/ struct _NMAgentManagerCallId { NMAgentManager *self; @@ -815,7 +815,7 @@ out: return FALSE; } -/*************************************************************/ +/*****************************************************************************/ static void _con_get_request_done (NMSecretAgent *agent, @@ -1263,7 +1263,7 @@ nm_agent_manager_cancel_secrets (NMAgentManager *self, req_complete_cancel (request_id, FALSE); } -/*************************************************************/ +/*****************************************************************************/ static void _con_save_request_done (NMSecretAgent *agent, @@ -1352,7 +1352,7 @@ nm_agent_manager_save_secrets (NMAgentManager *self, req->idle_id = g_idle_add (request_start, req); } -/*************************************************************/ +/*****************************************************************************/ static void _con_del_request_done (NMSecretAgent *agent, @@ -1440,7 +1440,7 @@ nm_agent_manager_delete_secrets (NMAgentManager *self, req->idle_id = g_idle_add (request_start, req); } -/*************************************************************/ +/*****************************************************************************/ NMSecretAgent * nm_agent_manager_get_agent_by_user (NMAgentManager *self, const char *username) @@ -1458,7 +1458,7 @@ nm_agent_manager_get_agent_by_user (NMAgentManager *self, const char *username) return NULL; } -/*************************************************************/ +/*****************************************************************************/ gboolean nm_agent_manager_all_agents_have_capability (NMAgentManager *manager, @@ -1484,7 +1484,7 @@ nm_agent_manager_all_agents_have_capability (NMAgentManager *manager, return TRUE; } -/*************************************************************/ +/*****************************************************************************/ static void agent_permissions_changed_done (NMAuthChain *chain, @@ -1548,7 +1548,7 @@ authority_changed_cb (NMAuthManager *auth_manager, NMAgentManager *self) } } -/*************************************************************/ +/*****************************************************************************/ NM_DEFINE_SINGLETON_GETTER (NMAgentManager, nm_agent_manager_get, NM_TYPE_AGENT_MANAGER); diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index 8bc88fd4d6..b357f12109 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -84,7 +84,7 @@ enum { }; static guint signals[LAST_SIGNAL] = { 0 }; -/*************************************************************/ +/*****************************************************************************/ struct _NMSecretAgentCallId { NMSecretAgent *agent; @@ -153,7 +153,7 @@ request_check_return (Request *r) return TRUE; } -/*************************************************************/ +/*****************************************************************************/ static char * _create_description (const char *dbus_owner, const char *identifier, gulong uid) @@ -307,7 +307,7 @@ nm_secret_agent_has_permission (NMSecretAgent *agent, const char *permission) return FALSE; } -/*************************************************************/ +/*****************************************************************************/ static void get_callback (GObject *proxy, @@ -378,7 +378,7 @@ nm_secret_agent_get_secrets (NMSecretAgent *self, return r; } -/*************************************************************/ +/*****************************************************************************/ static void cancel_done (GObject *proxy, GAsyncResult *result, gpointer user_data) @@ -468,7 +468,7 @@ nm_secret_agent_cancel_secrets (NMSecretAgent *self, NMSecretAgentCallId call_id do_cancel_secrets (self, r, FALSE); } -/*************************************************************/ +/*****************************************************************************/ static void agent_save_cb (GObject *proxy, @@ -521,7 +521,7 @@ nm_secret_agent_save_secrets (NMSecretAgent *self, return r; } -/*************************************************************/ +/*****************************************************************************/ static void agent_delete_cb (GObject *proxy, @@ -574,7 +574,7 @@ nm_secret_agent_delete_secrets (NMSecretAgent *self, return r; } -/*************************************************************/ +/*****************************************************************************/ static void _on_disconnected_cleanup (NMSecretAgentPrivate *priv) @@ -640,7 +640,7 @@ _on_disconnected_name_owner_changed (GDBusConnection *connection, } } -/*************************************************************/ +/*****************************************************************************/ NMSecretAgent * nm_secret_agent_new (GDBusMethodInvocation *context, diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index f22807d341..dbe927da6a 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -130,7 +130,7 @@ typedef struct { } NMSettingsConnectionPrivate; -/*******************************************************************/ +/*****************************************************************************/ static void _emit_updated (NMSettingsConnection *self, gboolean by_user) @@ -139,7 +139,7 @@ _emit_updated (NMSettingsConnection *self, gboolean by_user) g_signal_emit (self, signals[UPDATED_INTERNAL], 0, by_user); } -/*******************************************************************/ +/*****************************************************************************/ gboolean nm_settings_connection_has_unmodified_applied_connection (NMSettingsConnection *self, @@ -155,7 +155,7 @@ nm_settings_connection_has_unmodified_applied_connection (NMSettingsConnection * return nm_connection_compare (NM_CONNECTION (self), applied_connection, compare_flags); } -/**************************************************************/ +/*****************************************************************************/ /* Return TRUE to keep, FALSE to drop */ typedef gboolean (*ForEachSecretFunc) (NMSettingSecretFlags flags, @@ -290,7 +290,7 @@ find_secret (NMConnection *self, return data.found; } -/**************************************************************/ +/*****************************************************************************/ static void set_visible (NMSettingsConnection *self, gboolean new_visible) @@ -357,7 +357,7 @@ session_changed_cb (NMSessionMonitor *self, gpointer user_data) nm_settings_connection_recheck_visibility (NM_SETTINGS_CONNECTION (user_data)); } -/**************************************************************/ +/*****************************************************************************/ /* Return TRUE if any active user in the connection's ACL has the given * permission without having to authorize for it via PolicyKit. Connections @@ -408,7 +408,7 @@ nm_settings_connection_check_permission (NMSettingsConnection *self, return FALSE; } -/**************************************************************/ +/*****************************************************************************/ static gboolean secrets_filter_cb (NMSetting *setting, @@ -759,7 +759,7 @@ do_delete (NMSettingsConnection *self, g_object_unref (self); } -/**************************************************************/ +/*****************************************************************************/ typedef enum { @@ -1933,7 +1933,7 @@ out_err: g_dbus_method_invocation_take_error (context, error); } -/**************************************************************/ +/*****************************************************************************/ static void dbus_get_agent_secrets_cb (NMSettingsConnection *self, @@ -2084,7 +2084,7 @@ impl_settings_connection_clear_secrets (NMSettingsConnection *self, } } -/**************************************************************/ +/*****************************************************************************/ void nm_settings_connection_signal_remove (NMSettingsConnection *self) @@ -2103,7 +2103,7 @@ nm_settings_connection_get_unsaved (NMSettingsConnection *self) return NM_FLAGS_HAS (nm_settings_connection_get_flags (self), NM_SETTINGS_CONNECTION_FLAGS_UNSAVED); } -/**************************************************************/ +/*****************************************************************************/ NMSettingsConnectionFlags nm_settings_connection_get_flags (NMSettingsConnection *self) @@ -2149,7 +2149,7 @@ nm_settings_connection_set_flags_all (NMSettingsConnection *self, NMSettingsConn return old_flags; } -/*************************************************************/ +/*****************************************************************************/ /** * nm_settings_connection_get_timestamp: @@ -2604,7 +2604,7 @@ nm_settings_connection_get_uuid (NMSettingsConnection *self) return nm_connection_get_uuid (NM_CONNECTION (self)); } -/**************************************************************/ +/*****************************************************************************/ static void nm_settings_connection_init (NMSettingsConnection *self) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 7ea7530a4c..cb58c2b044 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -2069,7 +2069,7 @@ nm_settings_device_removed (NMSettings *self, NMDevice *device, gboolean quittin } } -/***************************************************************/ +/*****************************************************************************/ /* GCompareFunc helper for sorting "best" connections. * The function sorts connections in ascending timestamp order. @@ -2170,7 +2170,7 @@ nm_settings_get_best_connections (NMSettings *self, return g_slist_reverse (sorted); } -/***************************************************************/ +/*****************************************************************************/ gboolean nm_settings_get_startup_complete (NMSettings *self) @@ -2180,7 +2180,7 @@ nm_settings_get_startup_complete (NMSettings *self) return priv->startup_complete; } -/***************************************************************/ +/*****************************************************************************/ static void hostnamed_properties_changed (GDBusProxy *proxy, diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 626472d072..f0e59713c5 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -98,7 +98,7 @@ typedef struct { NMSupplicantConfig *cfg; } NMSupplicantInterfacePrivate; -/*********************************************************************************************/ +/*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_SUPPLICANT #define _NMLOG_PREFIX_NAME "sup-iface" @@ -118,7 +118,7 @@ typedef struct { _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ } G_STMT_END -/*********************************************************************************************/ +/*****************************************************************************/ static void emit_error_helper (NMSupplicantInterface *self, GError *error) @@ -1436,7 +1436,7 @@ nm_supplicant_interface_get_max_scan_ssids (NMSupplicantInterface *self) return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->max_scan_ssids; } -/*******************************************************************/ +/*****************************************************************************/ NMSupplicantInterface * nm_supplicant_interface_new (const char *ifname, diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index 57cd57131d..ba74bca94f 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -56,11 +56,11 @@ typedef struct { guint die_count; } NMSupplicantManagerPrivate; -/********************************************************************/ +/*****************************************************************************/ G_DEFINE_QUARK (nm-supplicant-error-quark, nm_supplicant_error); -/********************************************************************/ +/*****************************************************************************/ static inline gboolean die_count_exceeded (guint32 count) @@ -77,7 +77,7 @@ is_available (NMSupplicantManager *self) && !die_count_exceeded (priv->die_count); } -/********************************************************************/ +/*****************************************************************************/ static void _sup_iface_last_ref (gpointer data, @@ -351,7 +351,7 @@ on_proxy_acquired (GObject *object, GAsyncResult *result, gpointer user_data) name_owner_cb (priv->proxy, NULL, self); } -/*******************************************************************/ +/*****************************************************************************/ NM_DEFINE_SINGLETON_GETTER (NMSupplicantManager, nm_supplicant_manager_get, NM_TYPE_SUPPLICANT_MANAGER); diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 73358d027c..a3cbc3ec7c 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -29,7 +29,7 @@ #include "nm-test-utils-core.h" -/********************************************************************************/ +/*****************************************************************************/ static void _assert_config_value (const NMConfigData *config_data, const char *group, const char *key, const char *expected_value, const char *file, int line) @@ -46,7 +46,7 @@ _assert_config_value (const NMConfigData *config_data, const char *group, const } #define assert_config_value(config_data, group, key, expected_value) _assert_config_value (config_data, group, key, expected_value, __FILE__, __LINE__) -/********************************************************************************/ +/*****************************************************************************/ static NMConfig * setup_config (GError **error, const char *config_file, const char *intern_config, const char *const* atomic_section_prefixes, const char *config_dir, const char *system_config_dir, ...) diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c index 0a133de369..2ab0f89056 100644 --- a/src/tests/test-dcb.c +++ b/src/tests/test-dcb.c @@ -334,7 +334,7 @@ test_fcoe_cleanup (void) g_assert (success); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index ab2b15b5f2..3ec21328a3 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -36,7 +36,7 @@ #define CLOCK_BOOTTIME 7 #endif -/*******************************************/ +/*****************************************************************************/ static void test_nm_utils_monotonic_timestamp_as_boottime (void) @@ -72,7 +72,7 @@ test_nm_utils_monotonic_timestamp_as_boottime (void) } } -/*******************************************/ +/*****************************************************************************/ struct test_nm_utils_kill_child_async_data { @@ -370,7 +370,7 @@ test_nm_utils_kill_child (void) g_test_assert_expected_messages (); } -/*******************************************/ +/*****************************************************************************/ static void _remove_at_indexes_init_random_idx (GArray *idx, guint array_len, guint idx_len) @@ -469,7 +469,7 @@ test_nm_utils_array_remove_at_indexes (void) } } -/*******************************************/ +/*****************************************************************************/ static void test_nm_ethernet_address_is_valid (void) @@ -496,7 +496,7 @@ test_nm_ethernet_address_is_valid (void) g_assert ( nm_ethernet_address_is_valid (((guint8[8]) { 0x02,0x30,0xb4,0x00,0x00,0x01 }), ETH_ALEN)); } -/*******************************************/ +/*****************************************************************************/ typedef struct { union { @@ -852,7 +852,7 @@ test_nm_multi_index (void) _mi_test_run (50, 18); } -/*******************************************/ +/*****************************************************************************/ static void test_nm_utils_new_vlan_name (void) @@ -895,7 +895,7 @@ test_nm_utils_new_vlan_name (void) } } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/tests/test-general.c b/src/tests/test-general.c index 9769ead11b..2596cff6af 100644 --- a/src/tests/test-general.c +++ b/src/tests/test-general.c @@ -267,7 +267,7 @@ test_nm_utils_log_connection_diff (void) g_clear_object (&connection); } -/*******************************************/ +/*****************************************************************************/ static NMConnection * _match_connection_new (void) @@ -953,7 +953,7 @@ test_connection_sort_autoconnect_priority (void) _test_connection_sort_autoconnect_priority_free (c2); } -/*******************************************/ +/*****************************************************************************/ static const char *_test_match_spec_all[] = { "e", @@ -1085,7 +1085,7 @@ test_nm_match_spec_interface_name (void) #undef S } -/*******************************************/ +/*****************************************************************************/ static void _do_test_match_spec_match_config (const char *file, gint line, const char *spec_str, guint version, guint v_maj, guint v_min, guint v_mic, NMMatchSpecMatchType expected) @@ -1227,7 +1227,7 @@ test_nm_match_spec_match_config (void) do_test_match_spec_match_config ("nm-version-min:1.6,nm-version-min:1.4.6,nm-version-min:1.2.16,except:nm-version:1.4.8", 1, 8, 8, NM_MATCH_SPEC_MATCH); } -/*******************************************/ +/*****************************************************************************/ static void test_nm_utils_strbuf_append (void) diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index 95b221bc0c..23dd1ab331 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -322,7 +322,7 @@ test_strip_search_trailing_dot (void) g_object_unref (config); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c index 3eceec0cbe..05b0320610 100644 --- a/src/tests/test-ip6-config.c +++ b/src/tests/test-ip6-config.c @@ -340,7 +340,7 @@ test_strip_search_trailing_dot (void) g_object_unref (config); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE(); diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c index 32bc97342a..749eb664fb 100644 --- a/src/tests/test-resolvconf-capture.c +++ b/src/tests/test-resolvconf-capture.c @@ -287,7 +287,7 @@ test_capture_dns_options_valid6 (void) g_array_free (ns6, TRUE); g_ptr_array_free (dns_options, TRUE); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c index 3ae3a19d95..7f7e41f926 100644 --- a/src/tests/test-wired-defname.c +++ b/src/tests/test-wired-defname.c @@ -39,7 +39,7 @@ _new_connection (const char *id) return a; } -/*******************************************/ +/*****************************************************************************/ static char * _get_default_wired_name (GSList *list) @@ -55,7 +55,7 @@ _get_default_wired_name (GSList *list) return nm_device_ethernet_utils_get_default_wired_name (v); } -/*******************************************/ +/*****************************************************************************/ static void test_defname_no_connections (void) @@ -66,7 +66,7 @@ test_defname_no_connections (void) g_assert_cmpstr (name, ==, "Wired connection 1"); } -/*******************************************/ +/*****************************************************************************/ static void test_defname_no_conflict (void) @@ -84,7 +84,7 @@ test_defname_no_conflict (void) g_slist_free_full (list, g_object_unref); } -/*******************************************/ +/*****************************************************************************/ static void test_defname_conflict (void) @@ -102,7 +102,7 @@ test_defname_conflict (void) g_slist_free_full (list, g_object_unref); } -/*******************************************/ +/*****************************************************************************/ static void test_defname_multiple_conflicts (void) @@ -124,7 +124,7 @@ test_defname_multiple_conflicts (void) g_slist_free_full (list, g_object_unref); } -/*******************************************/ +/*****************************************************************************/ NMTST_DEFINE (); diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 1285f59cbd..9c510f4abe 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -188,7 +188,7 @@ static void _set_vpn_state (NMVpnConnection *self, NMVpnConnectionStateReason reason, gboolean quitting); -/*********************************************************************/ +/*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_VPN #define _NMLOG_PREFIX_NAME "vpn-connection" @@ -243,7 +243,7 @@ __LOG_create_prefix (char *buf, NMVpnConnection *self) } \ } G_STMT_END -/*********************************************************************/ +/*****************************************************************************/ static void cancel_get_secrets (NMVpnConnection *self) @@ -2321,7 +2321,7 @@ nm_vpn_connection_deactivate (NMVpnConnection *self, return success; } -/******************************************************************************/ +/*****************************************************************************/ static void plugin_need_secrets_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) @@ -2532,7 +2532,7 @@ plugin_interactive_secrets_required (NMVpnConnection *self, g_strfreev (hints); } -/******************************************************************************/ +/*****************************************************************************/ static void device_changed (NMActiveConnection *active, @@ -2563,7 +2563,7 @@ device_changed (NMActiveConnection *active, apply_parent_device_config (NM_VPN_CONNECTION (active)); } -/******************************************************************************/ +/*****************************************************************************/ static void nm_vpn_connection_init (NMVpnConnection *self) diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 6dcd546383..251748c182 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -47,7 +47,7 @@ typedef struct { GHashTable *active_services; } NMVpnManagerPrivate; -/******************************************************************************/ +/*****************************************************************************/ static void vpn_state_changed (NMVpnConnection *vpn, @@ -120,7 +120,7 @@ nm_vpn_manager_activate_connection (NMVpnManager *manager, return TRUE; } -/******************************************************************************/ +/*****************************************************************************/ static void try_add_plugin (NMVpnManager *self, NMVpnPluginInfo *plugin_info) @@ -202,7 +202,7 @@ vpn_dir_changed (GFileMonitor *monitor, } } -/******************************************************************************/ +/*****************************************************************************/ NM_DEFINE_SINGLETON_GETTER (NMVpnManager, nm_vpn_manager_get, NM_TYPE_VPN_MANAGER); |