fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 17:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: modify line separator comments to be 80 chars wide

Browse source 
sed 's#^/\*\{5\}\*\+/$#/*****************************************************************************/#' $(git grep -l '\*\{5\}' | grep '\.[hc]$') -i
This commit is contained in:
Thomas Haller 2016-10-02 18:22:50 +02:00
parent 05e66d5202
commit a83eb773ce
196 changed files with 783 additions and 783 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
callouts/tests/test-dispatcher-envp.c
View file

@ -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 ();

6
libnm-core/nm-connection.c
View file

@ -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)

18
libnm-core/nm-core-internal.h
View file

@ -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);

6
libnm-core/nm-keyfile-internal.h
View file

@ -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);

6
libnm-core/nm-keyfile-utils.c
View file

@ -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)

2
libnm-core/nm-keyfile-utils.h
View file

@ -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) \

4
libnm-core/nm-keyfile-writer.c
View file

@ -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;

6
libnm-core/nm-setting-bridge-port.c
View file

@ -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:

4
libnm-core/nm-setting-connection.c
View file

@ -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:

4
libnm-core/nm-setting-dcb.c
View file

@ -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)

2
libnm-core/nm-setting-generic.c
View file

@ -46,7 +46,7 @@ typedef struct {
int dummy;
} NMSettingGenericPrivate;
/**************************************************************************/
/*****************************************************************************/
/**
* nm_setting_generic_new:

2
libnm-core/nm-setting-ip-tunnel.c
View file

@ -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)

2
libnm-core/nm-setting-macvlan.c
View file

@ -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)

2
libnm-core/nm-setting-vlan.c
View file

@ -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)

2
libnm-core/nm-setting-vxlan.c
View file

@ -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)

10
libnm-core/nm-setting.c
View file

@ -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)

12
libnm-core/nm-utils.c
View file

@ -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

10
libnm-core/nm-vpn-editor-plugin.c
View file

@ -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:

4
libnm-core/nm-vpn-editor-plugin.h
View file

@ -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))

12
libnm-core/nm-vpn-plugin-info.c
View file

@ -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)

34
libnm-core/tests/test-general.c
View file

@ -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 ();

8
libnm-core/tests/test-keyfile.c
View file

@ -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 ();

2
libnm-glib/nm-access-point.c
View file

@ -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)

8
libnm-glib/nm-client.c
View file

@ -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:

2
libnm-glib/nm-device-adsl.c
View file

@ -140,7 +140,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_ADSL;
}
/******************************************************************/
/*****************************************************************************/
static void
nm_device_adsl_init (NMDeviceAdsl *device)

2
libnm-glib/nm-device-bond.c
View file

@ -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)

2
libnm-glib/nm-device-bridge.c
View file

@ -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)

2
libnm-glib/nm-device-bt.c
View file

@ -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)

2
libnm-glib/nm-device-ethernet.c
View file

@ -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)

4
libnm-glib/nm-device-generic.c
View file

@ -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)

2
libnm-glib/nm-device-infiniband.c
View file

@ -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)

2
libnm-glib/nm-device-modem.c
View file

@ -176,7 +176,7 @@ get_setting_type (NMDevice *device)
return G_TYPE_INVALID;
}
/*******************************************************************/
/*****************************************************************************/
static void
nm_device_modem_init (NMDeviceModem *device)

2
libnm-glib/nm-device-olpc-mesh.c
View file

@ -185,7 +185,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_OLPC_MESH;
}
/**************************************************************/
/*****************************************************************************/
static void
nm_device_olpc_mesh_init (NMDeviceOlpcMesh *device)

2
libnm-glib/nm-device-team.c
View file

@ -208,7 +208,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_TEAM;
}
/***********************************************************/
/*****************************************************************************/
static void
nm_device_team_init (NMDeviceTeam *device)

2
libnm-glib/nm-device-vlan.c
View file

@ -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)

2
libnm-glib/nm-device-wifi.c
View file

@ -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)

2
libnm-glib/nm-device-wimax.c
View file

@ -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)

10
libnm-glib/nm-remote-connection.c
View file

@ -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:

8
libnm-glib/nm-remote-settings.c
View file

@ -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:

10
libnm-glib/nm-secret-agent.c
View file

@ -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)

12
libnm-glib/nm-types.c
View file

@ -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)

8
libnm-glib/nm-vpn-plugin-ui-interface.h
View file

@ -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))

8
libnm-glib/nm-vpn-plugin.c
View file

@ -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,

2
libnm-glib/nm-wimax-nsp.c
View file

@ -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)

14
libnm-glib/tests/test-nm-client.c
View file

@ -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 ();

12
libnm-glib/tests/test-remote-settings-client.c
View file

@ -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 ();

6
libnm-util/nm-connection.c
View file

@ -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)

6
libnm-util/nm-param-spec-specialized.c
View file

@ -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

6
libnm-util/nm-setting-bridge-port.c
View file

@ -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:

4
libnm-util/nm-setting-connection.c
View file

@ -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:

4
libnm-util/nm-setting-dcb.c
View file

@ -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)

2
libnm-util/nm-setting-generic.c
View file

@ -71,7 +71,7 @@ typedef struct {
int dummy;
} NMSettingGenericPrivate;
/**************************************************************************/
/*****************************************************************************/
/**
* nm_setting_generic_new:

4
libnm-util/nm-setting-ip6-config.c
View file

@ -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;

2
libnm-util/nm-setting-vlan.c
View file

@ -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)

6
libnm-util/nm-setting.c
View file

@ -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)

6
libnm-util/nm-utils.c
View file

@ -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);

4
libnm-util/tests/test-general.c
View file

@ -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 ();

2
libnm/nm-access-point.c
View file

@ -381,7 +381,7 @@ nm_access_point_filter_connections (NMAccessPoint *ap, const GPtrArray *connecti
return filtered;
}
/************************************************************/
/*****************************************************************************/
static void
nm_access_point_init (NMAccessPoint *ap)

18
libnm/nm-client.c
View file

@ -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:

2
libnm/nm-device-adsl.c
View file

@ -84,7 +84,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_ADSL;
}
/******************************************************************/
/*****************************************************************************/
static void
nm_device_adsl_init (NMDeviceAdsl *device)

2
libnm/nm-device-bond.c
View file

@ -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)

2
libnm/nm-device-bridge.c
View file

@ -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)

2
libnm/nm-device-bt.c
View file

@ -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)

2
libnm/nm-device-ethernet.c
View file

@ -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)

4
libnm/nm-device-generic.c
View file

@ -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)

2
libnm/nm-device-infiniband.c
View file

@ -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)

2
libnm/nm-device-ip-tunnel.c
View file

@ -264,7 +264,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_IP_TUNNEL;
}
/***********************************************************/
/*****************************************************************************/
static void
nm_device_ip_tunnel_init (NMDeviceIPTunnel *device)

2
libnm/nm-device-macvlan.c
View file

@ -181,7 +181,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_MACVLAN;
}
/***********************************************************/
/*****************************************************************************/
static void
nm_device_macvlan_init (NMDeviceMacvlan *device)

2
libnm/nm-device-modem.c
View file

@ -153,7 +153,7 @@ get_setting_type (NMDevice *device)
return G_TYPE_INVALID;
}
/*******************************************************************/
/*****************************************************************************/
static void
nm_device_modem_init (NMDeviceModem *device)

2
libnm/nm-device-olpc-mesh.c
View file

@ -125,7 +125,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_OLPC_MESH;
}
/**************************************************************/
/*****************************************************************************/
static void
nm_device_olpc_mesh_init (NMDeviceOlpcMesh *device)

2
libnm/nm-device-team.c
View file

@ -151,7 +151,7 @@ get_setting_type (NMDevice *device)
return NM_TYPE_SETTING_TEAM;
}
/***********************************************************/
/*****************************************************************************/
static void
nm_device_team_init (NMDeviceTeam *device)

2
libnm/nm-device-tun.c
View file

@ -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)

2
libnm/nm-device-vlan.c
View file

@ -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)

2
libnm/nm-device-vxlan.c
View file

@ -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)

2
libnm/nm-device-wifi.c
View file

@ -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)

2
libnm/nm-device-wimax.c
View file

@ -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)

14
libnm/nm-manager.c
View file

@ -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)

6
libnm/nm-object.c
View file

@ -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)

6
libnm/nm-remote-connection.c
View file

@ -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)

4
libnm/nm-remote-settings.c
View file

@ -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)

10
libnm/nm-secret-agent-old.c
View file

@ -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)

4
libnm/nm-vpn-editor.h
View file

@ -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))

10
libnm/nm-vpn-plugin-old.c
View file

@ -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,

10
libnm/nm-vpn-service-plugin.c
View file

@ -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,

2
libnm/nm-wimax-nsp.c
View file

@ -172,7 +172,7 @@ nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp, const GPtrArray *connections)
return filtered;
}
/************************************************************/
/*****************************************************************************/
static void
nm_wimax_nsp_init (NMWimaxNsp *nsp)

16
libnm/tests/test-nm-client.c
View file

@ -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 ();

16
libnm/tests/test-remote-settings-client.c
View file

@ -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 ();

14
libnm/tests/test-secret-agent.c
View file

@ -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 ();

4
shared/nm-common-macros.h
View file

@ -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__ */

16
shared/nm-utils/nm-macros-internal.h
View file

@ -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)

8
shared/nm-utils/nm-shared-utils.h
View file

@ -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__ */

10
shared/nm-utils/nm-test-utils.h
View file

@ -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

8
src/NetworkManagerUtils.c
View file

@ -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);
}
/******************************************************************************/
/*****************************************************************************/

6
src/devices/adsl/nm-atm-manager.c
View file

@ -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)

10
src/devices/adsl/nm-device-adsl.c
View file

@ -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,

10
src/devices/bluetooth/nm-bluez-device.c
View file

@ -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,

6
src/devices/bluetooth/nm-bluez-manager.c
View file

@ -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)

2
src/devices/bluetooth/nm-bluez4-adapter.c
View file

@ -233,7 +233,7 @@ query_properties (NMBluez4Adapter *self)
get_properties_cb, self);
}
/***********************************************************/
/*****************************************************************************/
NMBluez4Adapter *
nm_bluez4_adapter_new (const char *path, NMSettings *settings)

2
src/devices/bluetooth/nm-bluez4-manager.c
View file

@ -222,7 +222,7 @@ name_owner_changed_cb (GObject *object,
}
}
/****************************************************************/
/*****************************************************************************/
NMBluez4Manager *
nm_bluez4_manager_new (NMSettings *settings)

2
src/devices/bluetooth/nm-bluez5-manager.c
View file

@ -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)

Some files were not shown because too many files have changed in this diff Show more