system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

all: remove consecutive empty lines

Browse source 
Normalize coding style by removing consecutive empty lines from C
sources and headers.

https://github.com/NetworkManager/NetworkManager/pull/108
This commit is contained in:
Beniamino Galvani 2018-04-30 13:46:24 +02:00
parent e09b2314b9
commit 1b5925ce88
189 changed files with 0 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clients/cli/agent.c
View file

@ -136,7 +136,6 @@ secrets_requested (NMSecretAgentSimple *agent,
nm_secret_agent_simple_response (agent, request_id, NULL);
}
static NMCResultCode
do_agent_secret (NmCli *nmc, int argc, char **argv)
{

5
clients/cli/connections.c
View file

@ -149,7 +149,6 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = {
// NM_SETTING_DUMMY_SETTING_NAME
// NM_SETTING_WIMAX_SETTING_NAME
const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[] = {
NMC_META_GENERIC ("GROUP"), /* 0 */
NMC_META_GENERIC ("TYPE"), /* 1 */
@ -2348,8 +2347,6 @@ parse_passwords (const char *passwd_file, GError **error)
return g_steal_pointer (&pwds_hash);
}
static gboolean
nmc_activate_connection (NmCli *nmc,
NMConnection *connection,
@ -7682,7 +7679,6 @@ editor_init_new_connection (NmCli *nmc, NMConnection *connection, const char *sl
NULL);
}
setting = nm_meta_setting_info_editor_new_setting (&nm_meta_setting_infos_editor[NM_META_SETTING_TYPE_IP4_CONFIG],
NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI);
nm_connection_add_setting (connection, setting);
@ -8446,7 +8442,6 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
next_arg (nmc, &argc, &argv, NULL);
}
if (argc == 0) {
/* nmc_do_cmd() should not call this with argc=0. */
g_assert (!nmc->complete);

2
clients/cli/devices.c
View file

@ -51,7 +51,6 @@ const NmcMetaGenericInfo *const nmc_fields_dev_status[] = {
};
#define NMC_FIELDS_DEV_STATUS_COMMON "DEVICE,TYPE,STATE,CONNECTION"
const NmcMetaGenericInfo *const nmc_fields_dev_show_general[] = {
NMC_META_GENERIC ("NAME"), /* 0 */
NMC_META_GENERIC ("DEVICE"), /* 1 */
@ -3658,7 +3657,6 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv)
goto finish;
}
if (ssids->len) {
g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
g_variant_builder_init (&array_builder, G_VARIANT_TYPE ("aay"));

2
clients/cli/general.c
View file

@ -1148,7 +1148,6 @@ client_state (NMClient *client, GParamSpec *param, NmCli *nmc)
g_free (str);
}
static void
device_overview (NmCli *nmc, NMDevice *device)
{
@ -1345,7 +1344,6 @@ do_overview (NmCli *nmc, int argc, char **argv)
if (nm_device_get_description (devices[i]) && strcmp (nm_device_get_description (devices[i]), ""))
g_print ("\t\"%s\"\n", nm_device_get_description (devices[i]));
device_overview (nmc, devices[i]);
if (ac)
ac_overview (nmc, ac);

1
clients/cli/utils.c
View file

@ -204,7 +204,6 @@ next_arg (NmCli *nmc, int *argc, char ***argv, ...)
if (*argc == 0)
return -1;
va_start (args, argv);
if (nmc && nmc->complete && *argc == 1) {

6
clients/common/nm-meta-setting-desc.c
View file

@ -609,7 +609,6 @@ _get_text_hidden (NMMetaAccessorGetType get_type)
return NM_META_TEXT_HIDDEN;
}
/*****************************************************************************/
G_GNUC_PRINTF (4, 5)
@ -1191,7 +1190,6 @@ _set_fcn_gobject_mac (ARGS_SET_FCN)
else
mode = NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT;
if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND)
valid = nm_utils_hwaddr_valid (value, INFINIBAND_ALEN);
else {
@ -1688,7 +1686,6 @@ vpn_data_item (const char *key, const char *value, gpointer user_data)
return TRUE; \
}
static gboolean
verify_string_list (const char *const*strv,
const char *prop,
@ -3091,7 +3088,6 @@ _set_fcn_infiniband_p_key (ARGS_SET_FCN)
return TRUE;
}
static gconstpointer
_get_fcn_infiniband_p_key (ARGS_GET_FCN)
{
@ -4421,7 +4417,6 @@ _describe_fcn_wired_s390_options (ARGS_DESCRIBE_FCN)
return (*out_to_free = s);
}
static gconstpointer
_get_fcn_wireless_ssid (ARGS_GET_FCN)
{
@ -4936,7 +4931,6 @@ static const NMMetaPropertyType _pt_gobject_devices = {
"Example:\n" \
" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n")
#define DEFINE_DCB_PROPRITY_PROPERTY_TYPE \
.property_type = &_pt_gobject_int, \
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \

1
clients/common/nm-polkit-listener.h
View file

@ -129,7 +129,6 @@ typedef void (*NMPolkitListenerOnShowErrorFunc) (const char *text);
*/
typedef void (*NMPolkitListenerOnCompletedFunc) (gboolean gained_authorization);
struct _NMPolkitListener {
PolkitAgentListener parent;
};

1
clients/tui/newt/nmt-newt-button-box.h
View file

@ -57,5 +57,4 @@ void nmt_newt_button_box_add_widget_start (NmtNewtButtonBox *bbox,
void nmt_newt_button_box_add_widget_end (NmtNewtButtonBox *bbox,
NmtNewtWidget *widget);
#endif /* NMT_NEWT_BUTTON_BOX_H */

1
clients/tui/nmt-edit-connection-list.c
View file

@ -319,7 +319,6 @@ listbox_activated (NmtNewtWidget *listbox, gpointer list)
edit_clicked (NMT_NEWT_BUTTON (priv->edit), list);
}
static void
connection_saved (GObject *conn,
GAsyncResult *result,

1
clients/tui/nmt-editor-grid.c
View file

@ -369,7 +369,6 @@ nmt_editor_grid_size_request (NmtNewtWidget *widget,
*width += 2;
}
static void
nmt_editor_grid_size_allocate (NmtNewtWidget *widget,
int x,

1
clients/tui/nmt-editor.c
View file

@ -153,7 +153,6 @@ page_saved (gpointer data, gpointer user_data)
nmt_editor_page_saved (page);
}
static void
save_connection_and_exit (NmtNewtButton *button,
gpointer user_data)

1
clients/tui/nmt-mac-entry.c
View file

@ -34,7 +34,6 @@
#include "nm-common-macros.h"
G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY)
#define NMT_MAC_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMT_TYPE_MAC_ENTRY, NmtMacEntryPrivate))

1
clients/tui/nmt-page-wifi.c
View file

@ -384,7 +384,6 @@ nmt_page_wifi_finalize (GObject *object)
G_OBJECT_CLASS (nmt_page_wifi_parent_class)->finalize (object);
}
static void
nmt_page_wifi_class_init (NmtPageWifiClass *wifi_class)
{

1
dispatcher/nm-dispatcher-utils.c
View file

@ -414,7 +414,6 @@ nm_dispatcher_utils_construct_envp (const char *action,
if (g_variant_lookup (connection_props, NMD_CONNECTION_PROPS_FILENAME, "&s", &filename))
items = g_slist_prepend (items, g_strdup_printf ("CONNECTION_FILENAME=%s", filename));
/* Canonicalize the VPN interface name; "" is used when passing it through
* D-Bus so make sure that's fixed up here.
*/

2
dispatcher/nm-dispatcher.c
View file

@ -862,7 +862,6 @@ log_handler (const gchar *log_domain,
syslog (syslog_priority, "%s", message);
}
static void
logging_setup (void)
{
@ -919,7 +918,6 @@ main (int argc, char **argv)
g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM));
g_unix_signal_add (SIGINT, signal_handler, GINT_TO_POINTER (SIGINT));
if (debug) {
if (!g_getenv ("G_MESSAGES_DEBUG")) {
/* we log our regular messages using g_debug() and g_info().

1
examples/C/glib/add-connection-libnm.c
View file

@ -97,7 +97,6 @@ add_connection (NMClient *client, GMainLoop *loop, const char *con_name)
g_object_unref (connection);
}
int
main (int argc, char *argv[])
{

1
examples/C/glib/get-active-connections-gdbus.c
View file

@ -245,7 +245,6 @@ out:
g_variant_unref (ret);
}
int
main (int argc, char *argv[])
{

1
examples/C/glib/monitor-nm-running-gdbus.c
View file

@ -48,7 +48,6 @@ on_name_vanished (GDBusConnection *connection,
g_print ("Name '%s' does not exist on the system bus => NM is not running\n", name);
}
int
main (int argc, char *argv[])
{

1
examples/C/glib/monitor-nm-state-gdbus.c
View file

@ -81,7 +81,6 @@ on_signal (GDBusProxy *proxy,
}
}
int
main (int argc, char *argv[])
{

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

@ -515,7 +515,6 @@ nm_connection_compare (NMConnection *a,
return TRUE;
}
static gboolean
diff_one_connection (NMConnection *a,
NMConnection *b,

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

@ -35,7 +35,6 @@
#error Cannot use this header.
#endif
#include "nm-connection.h"
#include "nm-core-enum-types.h"
#include "nm-setting-8021x.h"
@ -117,7 +116,6 @@
*/
#define NM_SETTING_COMPARE_FLAG_NONE ((NMSettingCompareFlags) 0)
#define NM_SETTING_SECRET_FLAGS_ALL \
(NM_SETTING_SECRET_FLAG_NONE | \
NM_SETTING_SECRET_FLAG_AGENT_OWNED | \

2
libnm-core/nm-dbus-interface.h
View file

@ -296,7 +296,6 @@ typedef enum { /*< flags >*/
NM_WIFI_DEVICE_CAP_FREQ_5GHZ = 0x00000400,
} NMDeviceWifiCapabilities;
/**
* NM80211ApFlags:
* @NM_802_11_AP_FLAGS_NONE: access point has no special capabilities
@ -832,7 +831,6 @@ typedef enum {
NM_IP_TUNNEL_MODE_VTI6 = 9,
} NMIPTunnelMode;
/**
* NMCheckpointCreateFlags:
* @NM_CHECKPOINT_CREATE_FLAG_NONE: no flags

1
libnm-core/nm-dbus-utils.c
View file

@ -174,7 +174,6 @@ _nm_dbus_signal_connect_data (GDBusProxy *proxy,
* Returns: the signal handler ID, as with _nm_signal_connect_data().
*/
static void
typecheck_response (GVariant **response,
const GVariantType *reply_type,

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

@ -94,7 +94,6 @@ typedef struct {
const char *message;
} NMKeyfileReadTypeDataWarn;
NMConnection *nm_keyfile_read (GKeyFile *keyfile,
const char *keyfile_name,
const char *base_dir,
@ -149,7 +148,6 @@ typedef struct {
NMSetting8021x *setting;
} NMKeyfileWriteTypeDataCert;
GKeyFile *nm_keyfile_write (NMConnection *connection,
NMKeyfileWriteHandler handler,
void *user_data,
@ -165,5 +163,4 @@ gboolean _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b);
gboolean _nm_keyfile_equals (GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order);
gboolean _nm_keyfile_has_values (GKeyFile *keyfile);
#endif /* __NM_KEYFILE_INTERNAL_H__ */

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

@ -179,7 +179,6 @@ DEFINE_KF_WRAPPER(uint64, guint64, guint64);
DEFINE_KF_WRAPPER(boolean, gboolean, gboolean);
DEFINE_KF_WRAPPER(value, gchar*, const gchar*);
gchar **
nm_keyfile_plugin_kf_get_keys (GKeyFile *kf,
const char *group,
@ -288,7 +287,6 @@ _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b)
return TRUE;
}
static gboolean
_nm_keyfile_equals_ordered (GKeyFile *kf_a, GKeyFile *kf_b)
{

2
libnm-core/nm-keyfile.c
View file

@ -313,7 +313,6 @@ read_field (char **current, const char **out_err_str, const char *characters, co
#define DIGITS "0123456789"
#define DELIMITERS "/;,"
/* The following IPv4 and IPv6 address formats are supported:
*
* address (DEPRECATED)
@ -583,7 +582,6 @@ ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const c
gs_free IPAddrRouteBuildListData *build_list = NULL;
gsize i_build_list, build_list_len = 0;
keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, setting_name, &keys_len, NULL);
if (keys_len == 0)

6
libnm-core/nm-setting-8021x.c
View file

@ -1686,7 +1686,6 @@ nm_setting_802_1x_remove_phase2_altsubject_match (NMSetting8021x *setting, guint
g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES);
}
/**
* nm_setting_802_1x_remove_phase2_altsubject_match_by_value:
* @setting: the #NMSetting8021x
@ -3060,7 +3059,6 @@ static void need_secrets_phase2 (NMSetting8021x *self,
GPtrArray *secrets,
gboolean phase2);
typedef void (*EAPMethodNeedSecretsFunc) (NMSetting8021x *self,
GPtrArray *secrets,
gboolean phase2);
@ -3126,7 +3124,6 @@ need_secrets_phase2 (NMSetting8021x *self,
}
}
static GPtrArray *
need_secrets (NMSetting *setting)
{
@ -4423,9 +4420,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
/**
* NMSetting8021x:phase2-client-cert-password:
*

1
libnm-core/nm-setting-8021x.h
View file

@ -280,7 +280,6 @@ gboolean nm_setting_802_1x_set_phase2_ca_cert (NMSetting8
NMSetting8021xCKFormat *out_format,
GError **error);
NM_AVAILABLE_IN_1_8
const char * nm_setting_802_1x_get_phase2_ca_cert_password (NMSetting8021x *setting);
NM_AVAILABLE_IN_1_8

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

@ -288,7 +288,6 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting)
return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->type;
}
/**
* nm_setting_connection_get_num_permissions:
* @setting: the #NMSettingConnection
@ -1731,7 +1730,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
NM_SETTING_PARAM_FUZZY_IGNORE |
G_PARAM_STATIC_STRINGS));
/**
* NMSettingConnection:autoconnect-retries:
*

1
libnm-core/nm-setting-dcb.h
View file

@ -70,7 +70,6 @@ typedef enum { /*< flags >*/
*/
#define NM_SETTING_DCB_FCOE_MODE_VN2VN "vn2vn"
/* Properties */
#define NM_SETTING_DCB_APP_FCOE_FLAGS "app-fcoe-flags"
#define NM_SETTING_DCB_APP_FCOE_PRIORITY "app-fcoe-priority"

1
libnm-core/nm-setting-ip-config.h
View file

@ -72,7 +72,6 @@ void nm_ip_address_set_attribute (NMIPAddress *address,
const char *name,
GVariant *value);
typedef struct NMIPRoute NMIPRoute;
GType nm_ip_route_get_type (void);

1
libnm-core/nm-setting-ip4-config.c
View file

@ -524,7 +524,6 @@ ip4_route_data_set (NMSetting *setting,
return TRUE;
}
static void
nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class)
{

3
libnm-core/nm-setting-ip6-config.c
View file

@ -63,7 +63,6 @@ typedef struct {
char *token;
} NMSettingIP6ConfigPrivate;
enum {
PROP_0,
PROP_IP6_PRIVACY,
@ -281,7 +280,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
return TRUE;
}
static void
nm_setting_ip6_config_init (NMSettingIP6Config *setting)
{
@ -792,7 +790,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/* IP6-specific property overrides */
/* ---dbus---

1
libnm-core/nm-setting-ovs-interface.c
View file

@ -244,7 +244,6 @@ normalize:
return TRUE;
}
static int
verify (NMSetting *setting, NMConnection *connection, GError **error)
{

1
libnm-core/nm-setting-ovs-port.c
View file

@ -436,7 +436,6 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *setting_class)
NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS));
/**
* NMSettingOvsPort:bond-updelay:
*

1
libnm-core/nm-setting-private.h
View file

@ -58,7 +58,6 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting,
NMSettingClearSecretsWithFlagsFn func,
gpointer user_data);
/* The property of the #NMSetting should be considered during comparisons that
* use the %NM_SETTING_COMPARE_FLAG_INFERRABLE flag. Properties that don't have
* this flag, are ignored when doing an infrerrable comparison. This flag should

1
libnm-core/nm-setting-serial.c
View file

@ -51,7 +51,6 @@ typedef struct {
guint64 send_delay;
} NMSettingSerialPrivate;
enum {
PROP_0,
PROP_BAUD,

1
libnm-core/nm-setting-tc-config.c
View file

@ -1423,7 +1423,6 @@ _tfilters_from_variant (GVariant *value)
action_var = g_variant_lookup_value (tfilter_var, "action", G_VARIANT_TYPE_VARDICT);
if (action_var) {
if (!g_variant_lookup (action_var, "kind", "&s", &action_kind)) {
//g_warning ("Ignoring tfilter with invalid action");

3
libnm-core/nm-setting-tc-config.h
View file

@ -49,7 +49,6 @@ gboolean nm_tc_qdisc_equal (NMTCQdisc *qdisc,
NM_AVAILABLE_IN_1_12
NMTCQdisc *nm_tc_qdisc_dup (NMTCQdisc *qdisc);
NM_AVAILABLE_IN_1_12
const char *nm_tc_qdisc_get_kind (NMTCQdisc *qdisc);
NM_AVAILABLE_IN_1_12
@ -80,7 +79,6 @@ gboolean nm_tc_action_equal (NMTCAction *action,
NM_AVAILABLE_IN_1_12
NMTCAction *nm_tc_action_dup (NMTCAction *action);
NM_AVAILABLE_IN_1_12
const char *nm_tc_action_get_kind (NMTCAction *action);
@ -129,7 +127,6 @@ NMTCAction *nm_tc_tfilter_get_action (NMTCTfilter *tfilter);
NM_AVAILABLE_IN_1_12
void nm_tc_tfilter_set_action (NMTCTfilter *tfilter, NMTCAction *action);
#define NM_TYPE_SETTING_TC_CONFIG (nm_setting_tc_config_get_type ())
#define NM_SETTING_TC_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_TC_CONFIG, NMSettingTCConfig))
#define NM_SETTING_TC_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_TC_CONFIG, NMSettingTCConfigClass))

1
libnm-core/nm-setting-team-port.c
View file

@ -80,7 +80,6 @@ static const _NMUtilsTeamPropertyKeys _prop_to_keys[LAST_PROP] = {
[PROP_LINK_WATCHERS] = { "link_watch", NULL, NULL, 0 }
};
/**
* nm_setting_team_port_new:
*

1
libnm-core/nm-setting-team.c
View file

@ -1304,7 +1304,6 @@ finalize (GObject *object)
G_OBJECT_CLASS (nm_setting_team_parent_class)->finalize (object);
}
#define JSON_TO_VAL(typ, id) _nm_utils_json_extract_##typ (priv->config, _prop_to_keys[id], FALSE)
static void

3
libnm-core/nm-setting-team.h
View file

@ -52,7 +52,6 @@ typedef enum { /*< flags >*/
#define NM_TEAM_LINK_WATCHER_ARP_PING "arp_ping"
#define NM_TEAM_LINK_WATCHER_NSNA_PING "nsna_ping"
typedef struct NMTeamLinkWatcher NMTeamLinkWatcher;
GType nm_team_link_watcher_get_type (void);
@ -102,7 +101,6 @@ const char *nm_team_link_watcher_get_source_host (NMTeamLinkWatcher *watcher);
NM_AVAILABLE_IN_1_12
NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher *watcher);
#define NM_TYPE_SETTING_TEAM (nm_setting_team_get_type ())
#define NM_SETTING_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_TEAM, NMSettingTeam))
#define NM_SETTING_TEAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_TEAM, NMSettingTeamClass))
@ -154,7 +152,6 @@ NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher
#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 65535
#define NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO
/**
* NMSettingTeam:
*

1
libnm-core/nm-setting-user.h
View file

@ -57,7 +57,6 @@ const char *nm_setting_user_get_data (NMSettingUser *setting, const
NM_AVAILABLE_IN_1_8
gboolean nm_setting_user_set_data (NMSettingUser *setting, const char *key, const char *val, GError **error);
NM_AVAILABLE_IN_1_8
gboolean nm_setting_user_check_key (const char *key, GError **error);
NM_AVAILABLE_IN_1_8

1
libnm-core/nm-setting-vpn.h
View file

@ -109,7 +109,6 @@ NM_AVAILABLE_IN_1_12
const char ** nm_setting_vpn_get_secret_keys (NMSettingVpn *setting,
guint *out_length);
NM_AVAILABLE_IN_1_2
guint32 nm_setting_vpn_get_timeout (NMSettingVpn *setting);

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

@ -682,7 +682,6 @@ set_property_from_dbus (const NMSettingProperty *property,
return TRUE;
}
/**
* _nm_setting_to_dbus:
* @setting: the #NMSetting

5
libnm-core/nm-setting.h
View file

@ -51,7 +51,6 @@ G_BEGIN_DECLS
/* Note: all non-glib GParamFlags bits are reserved by NetworkManager */
#define NM_SETTING_NAME "name"
/**
@ -130,7 +129,6 @@ typedef enum {
/* Higher flags like 0x80000000 and 0x40000000 are used internally as private flags */
} NMSettingCompareFlags;
/**
* NMSettingMacRandomization:
* @NM_SETTING_MAC_RANDOMIZATION_DEFAULT: the default value, which unless
@ -146,7 +144,6 @@ typedef enum {
NM_SETTING_MAC_RANDOMIZATION_ALWAYS,
} NMSettingMacRandomization;
/**
* NMSetting:
*
@ -157,7 +154,6 @@ struct _NMSetting {
GObject parent;
};
/**
* NMSettingClearSecretsWithFlagsFn:
* @setting: The setting for which secrets are being iterated
@ -233,7 +229,6 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting,
GParamFlags flags,
gpointer user_data);
GType nm_setting_get_type (void);
GType nm_setting_lookup_type (const char *name);

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

@ -136,7 +136,6 @@ static const struct IsoLangToEncodings isoLangEntries2[] =
LANG_ENCODINGS (NULL, NULL)
};
static GHashTable * langToEncodings5 = NULL;
static GHashTable * langToEncodings2 = NULL;
@ -2237,7 +2236,6 @@ nm_utils_tc_qdisc_to_str (NMTCQdisc *qdisc, GError **error)
return g_string_free (string, FALSE);
}
static gboolean
_tc_read_common_opts (const char *str,
guint32 *handle,
@ -3038,7 +3036,6 @@ _nm_utils_check_file (const char *filename,
return TRUE;
}
gboolean
_nm_utils_check_module_file (const char *name,
int check_owner,
@ -5018,7 +5015,6 @@ _json_team_add_defaults (json_t *json,
json_object_set_new (json_element, "name", json_string (runner));
}
if (nm_streq (runner, NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP)) {
_json_add_object (json, "notify_peers", "count", NULL,
json_integer (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT_ACTIVEBACKUP_DEFAULT));
@ -5305,7 +5301,6 @@ fail:
return NULL;
}
/**
* nm_utils_is_json_object:
* @str: the JSON string to test
@ -5421,7 +5416,6 @@ out:
return ret;
}
GValue *
_nm_utils_team_config_get (const char *conf,
const char *key,

4
libnm-core/nm-vpn-dbus-interface.h
View file

@ -60,7 +60,6 @@
#define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments"
#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
/*
* VPN daemon signals
*/
@ -95,7 +94,6 @@ typedef enum {
NM_VPN_SERVICE_STATE_STOPPED
} NMVpnServiceState;
/**
* NMVpnConnectionState:
* @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is
@ -216,7 +214,6 @@ typedef enum {
*/
#define NM_VPN_PLUGIN_CAN_PERSIST "can-persist"
/*** Ip4Config ***/
/* uint32: IP address of the internal gateway of the subnet the VPN interface is
@ -273,7 +270,6 @@ typedef enum {
#define NM_VPN_PLUGIN_IP4_CONFIG_MTU NM_VPN_PLUGIN_CONFIG_MTU
#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV NM_VPN_PLUGIN_CONFIG_TUNDEV
/*** Ip6Config ***/
/* array of uint8: IP address of the internal gateway of the subnet the VPN interface is

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

@ -47,7 +47,6 @@ typedef NMVpnEditorPlugin * (*NMVpnEditorPluginFactory) (GError **error);
NMVpnEditorPlugin *nm_vpn_editor_plugin_factory (GError **error);
#endif
/*****************************************************************************/
/* Editor plugin interface */
/*****************************************************************************/

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

@ -933,7 +933,6 @@ nm_vpn_plugin_info_supports_multiple (NMVpnPluginInfo *self)
return _nm_utils_ascii_str_to_bool (s, FALSE);
}
/**
* nm_vpn_plugin_info_get_aliases:
* @self: plugin info instance

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

@ -6370,7 +6370,6 @@ test_nm_utils_enum_get_values_do (GType type, int from, int to, const char *exp_
g_free (strv);
}
static void test_nm_utils_enum (void)
{
GType bool_enum = nm_test_general_bool_enum_get_type();
@ -6724,7 +6723,6 @@ test_nm_in_strset (void)
_ASSERT (3, !NM_IN_STRSET_SE ("a", G(NULL), G("b"), G("b")));
_ASSERT (3, !NM_IN_STRSET_SE (NULL, G("a"), G("b"), G("b")));
_ASSERT (3, NM_IN_STRSET ("a", G(NULL), G("b"), G("a"), N("a")));
_ASSERT (4, NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("a")));
_ASSERT (4, !NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d")));

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

@ -33,7 +33,6 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_WIRED_TLS_CA_CERT TEST_CERT_DIR"/test-ca-cert.pem"
#define TEST_WIRED_TLS_PRIVKEY TEST_CERT_DIR"/test-key-and-cert.pem"
@ -203,7 +202,6 @@ _nm_keyfile_read (GKeyFile *keyfile,
return con;
}
static void
_keyfile_convert (NMConnection **con,
GKeyFile **keyfile,
@ -412,14 +410,12 @@ test_8021x_cert (void)
g_assert_no_error (error);
g_assert (success);
/* test reseting ca-cert to different values and see whether we can write/read. */
nm_connection_add_setting (con, NM_SETTING (s_8021x));
nmtst_assert_connection_verifies_and_normalizable (con);
nmtst_connection_normalize (con);
_test_8021x_cert_check (con, scheme, full_TEST_WIRED_TLS_CA_CERT, -1);
scheme = NM_SETTING_802_1X_CK_SCHEME_BLOB;
@ -457,7 +453,6 @@ test_8021x_cert_read (void)
"/test_8021x_cert_read/test0", NULL);
CLEAR (&con, &keyfile);
keyfile = _keyfile_load_from_data (
"[connection]\n"
"type=ethernet"
@ -480,7 +475,6 @@ test_8021x_cert_read (void)
_keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test2", NULL, NULL, NULL, NULL, NULL, TRUE);
CLEAR (&con, &keyfile);
keyfile = _keyfile_load_from_data (
"[connection]\n"
"type=802-3-ethernet\n"
@ -523,7 +517,6 @@ test_8021x_cert_read (void)
g_assert_cmpint (strlen (nm_setting_802_1x_get_private_key_path (s_8021x)), ==, 505);
CLEAR (&con, &keyfile);
keyfile = _keyfile_load_from_data (
"[connection]\n"
"type=802-3-ethernet\n"
@ -549,7 +542,6 @@ test_8021x_cert_read (void)
_assert_gbytes (nm_setting_802_1x_get_private_key_blob (s_8021x), "hallo", -1);
CLEAR (&con, &keyfile);
keyfile = _keyfile_load_from_data (
"[connection]\n"
"type=802-3-ethernet\n"
@ -575,7 +567,6 @@ test_8021x_cert_read (void)
_assert_gbytes (nm_setting_802_1x_get_private_key_blob (s_8021x), "abc.deR\0", 8);
CLEAR (&con, &keyfile);
keyfile = _keyfile_load_from_data (
"[connection]\n"
"type=802-3-ethernet\n"

1
libnm-core/tests/test-secrets.c
View file

@ -259,7 +259,6 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme)
&error);
nmtst_assert_success (success, error);
/* IP4 setting */
s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
nm_connection_add_setting (connection, NM_SETTING (s_ip4));

3
libnm-core/tests/test-setting.c
View file

@ -599,7 +599,6 @@ test_bond_normalize (void)
NM_SETTING_DCB_FLAG_ADVERTISE | \
NM_SETTING_DCB_FLAG_WILLING)
static void
test_dcb_flags_valid (void)
{
@ -943,7 +942,6 @@ _test_team_config_sync (const char *team_config,
g_assert (nm_setting_verify ((NMSetting *) s_team, NULL, NULL));
}
static void
test_runner_roundrobin_sync_from_config (void)
{
@ -1183,7 +1181,6 @@ _test_team_port_config_sync (const char *team_port_config,
g_assert (nm_setting_verify ((NMSetting *) s_team_port, NULL, NULL));
}
static void
test_team_port_default (void)
{

16
libnm-glib/libnm_glib.c
View file

@ -34,7 +34,6 @@
#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist"
struct libnm_glib_ctx
{
unsigned char check;
@ -65,12 +64,10 @@ typedef struct libnm_glib_callback
gpointer user_data;
} libnm_glib_callback;
static void _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx);
static DBusConnection * _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context);
static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state);
static void
_libnm_glib_nm_state_cb (DBusPendingCall *pcall, void *user_data)
{
@ -184,7 +181,6 @@ _libnm_glib_call_callbacks (libnm_glib_ctx *ctx)
g_mutex_unlock (ctx->callbacks_lock);
}
static void
_libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state)
{
@ -215,7 +211,6 @@ _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state)
_libnm_glib_call_callbacks (ctx);
}
static DBusHandlerResult
_libnm_glib_dbus_filter (DBusConnection *connection,
DBusMessage *message,
@ -287,7 +282,6 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
}
/*
* libnm_glib_dbus_init
*
@ -339,7 +333,6 @@ _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context)
return (connection);
}
/*
* libnm_glib_dbus_watcher
*
@ -378,7 +371,6 @@ _libnm_glib_dbus_watcher (gpointer user_data)
return FALSE;
}
/*
* libnm_glib_schedule_dbus_watcher
*
@ -400,7 +392,6 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx)
}
}
/*
* libnm_glib_dbus_worker
*
@ -431,7 +422,6 @@ _libnm_glib_dbus_worker (gpointer user_data)
return NULL;
}
static void
_libnm_glib_ctx_free (libnm_glib_ctx *ctx)
{
@ -468,7 +458,6 @@ _libnm_glib_ctx_free (libnm_glib_ctx *ctx)
g_free (ctx);
}
static libnm_glib_ctx *
_libnm_glib_ctx_new (void)
{
@ -489,7 +478,6 @@ error:
return NULL;
}
libnm_glib_ctx *
libnm_glib_init (void)
{
@ -517,7 +505,6 @@ error:
return NULL;
}
void
libnm_glib_shutdown (libnm_glib_ctx *ctx)
{
@ -530,7 +517,6 @@ libnm_glib_shutdown (libnm_glib_ctx *ctx)
_libnm_glib_ctx_free (ctx);
}
libnm_glib_state
libnm_glib_get_network_state (const libnm_glib_ctx *ctx)
{
@ -540,7 +526,6 @@ libnm_glib_get_network_state (const libnm_glib_ctx *ctx)
return ctx->nm_state;
}
guint
libnm_glib_register_callback (libnm_glib_ctx *ctx,
libnm_glib_callback_func func,
@ -568,7 +553,6 @@ libnm_glib_register_callback (libnm_glib_ctx *ctx,
return (callback->id);
}
void
libnm_glib_unregister_callback (libnm_glib_ctx *ctx,
guint id)

2
libnm-glib/libnm_glib.h
View file

@ -41,10 +41,8 @@ typedef enum libnm_glib_state
typedef struct libnm_glib_ctx libnm_glib_ctx G_GNUC_DEPRECATED;
typedef void (*libnm_glib_callback_func) (libnm_glib_ctx *libnm_ctx, gpointer user_data) G_GNUC_DEPRECATED;
G_GNUC_DEPRECATED libnm_glib_ctx * libnm_glib_init (void);
G_GNUC_DEPRECATED void libnm_glib_shutdown (libnm_glib_ctx *ctx);

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

@ -563,7 +563,6 @@ constructed (GObject *object)
register_properties (NM_ACCESS_POINT (object));
}
static void
nm_access_point_class_init (NMAccessPointClass *ap_class)
{

1
libnm-glib/nm-access-point.h
View file

@ -51,7 +51,6 @@ G_BEGIN_DECLS
/* DEPRECATED */
#define NM_ACCESS_POINT_HW_ADDRESS "hw-address"
typedef struct {
NMObject parent;
} NMAccessPoint;

1
libnm-glib/nm-active-connection.c
View file

@ -638,7 +638,6 @@ constructed (GObject *object)
register_properties (NM_ACTIVE_CONNECTION (object));
}
static void
nm_active_connection_class_init (NMActiveConnectionClass *ap_class)
{

1
libnm-glib/nm-device.c
View file

@ -1311,7 +1311,6 @@ nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect)
g_value_init (&value, G_TYPE_BOOLEAN);
g_value_set_boolean (&value, autoconnect);
NM_DEVICE_GET_PRIVATE (device)->autoconnect = autoconnect;
_nm_object_set_property (NM_OBJECT (device),

1
libnm-glib/nm-object.c
View file

@ -1374,7 +1374,6 @@ _nm_object_suppress_property_updates (NMObject *object, gboolean suppress)
priv->suppress_property_updates = suppress;
}
void
_nm_object_ensure_inited (NMObject *object)
{

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

@ -67,7 +67,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
typedef struct RemoteCall RemoteCall;
typedef void (*RemoteCallFetchResultCb) (RemoteCall *call, DBusGProxyCall *proxy_call, GError *error);
struct RemoteCall {
NMRemoteConnection *self;
DBusGProxyCall *call;
@ -390,7 +389,6 @@ get_secrets_cb (RemoteCall *call, DBusGProxyCall *proxy_call, GError *error)
g_hash_table_destroy (secrets);
}
/**
* nm_remote_connection_get_secrets:
* @connection: the #NMRemoteConnection
@ -708,7 +706,6 @@ init_async (GAsyncInitable *initable, int io_priority,
NMRemoteConnectionInitData *init_data;
NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (initable);
init_data = g_slice_new0 (NMRemoteConnectionInitData);
init_data->connection = NM_REMOTE_CONNECTION (initable);
init_data->result = g_simple_async_result_new (G_OBJECT (initable), callback,

1
libnm-glib/nm-remote-connection.h
View file

@ -36,7 +36,6 @@ G_BEGIN_DECLS
#define NM_IS_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_CONNECTION))
#define NM_REMOTE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass))
/**
* NMRemoteConnectionError:
* @NM_REMOTE_CONNECTION_ERROR_UNKNOWN: unknown or unclassified error

3
libnm-glib/nm-remote-settings.h
View file

@ -59,7 +59,6 @@ typedef enum {
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
GQuark nm_remote_settings_error_quark (void);
#define NM_REMOTE_SETTINGS_BUS "bus"
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
#define NM_REMOTE_SETTINGS_HOSTNAME "hostname"
@ -71,7 +70,6 @@ GQuark nm_remote_settings_error_quark (void);
typedef struct _NMRemoteSettings NMRemoteSettings;
typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass;
typedef void (*NMRemoteSettingsAddConnectionFunc) (NMRemoteSettings *settings,
NMRemoteConnection *connection,
GError *error,
@ -86,7 +84,6 @@ typedef void (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
GError *error,
gpointer user_data);
struct _NMRemoteSettings {
GObject parent;
};

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

@ -98,7 +98,6 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
/*****************************************************************************/
GQuark

1
libnm-glib/nm-vpn-connection.c
View file

@ -55,7 +55,6 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
/**
* nm_vpn_connection_new:
* @connection: the #DBusGConnection

3
libnm-glib/nm-vpn-plugin-ui-interface.c
View file

@ -69,7 +69,6 @@ interface_init (gpointer g_iface)
initialized = TRUE;
}
GType
nm_vpn_plugin_ui_interface_get_type (void)
{
@ -99,7 +98,6 @@ nm_vpn_plugin_ui_interface_get_type (void)
return vpn_plugin_ui_interface_type;
}
NMVpnPluginUiWidgetInterface *
nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
NMConnection *connection,
@ -167,7 +165,6 @@ nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
return TRUE;
}
static void
widget_interface_init (gpointer g_iface)
{

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

@ -37,7 +37,6 @@ typedef struct _NMVpnPluginUiWidgetInterface NMVpnPluginUiWidgetInterface;
typedef NMVpnPluginUiInterface * (*NMVpnPluginUiFactory) (GError **error);
NMVpnPluginUiInterface *nm_vpn_plugin_ui_factory (GError **error);
/*****************************************************************************/
/* Plugin interface */
/*****************************************************************************/
@ -93,7 +92,6 @@ typedef enum {
NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
} NMVpnPluginUiInterfaceProp;
struct _NMVpnPluginUiInterface {
GTypeInterface g_iface;
@ -173,7 +171,6 @@ gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *i
NMConnection *connection,
GError **error);
/*****************************************************************************/
/* UI widget interface */
/*****************************************************************************/
@ -224,7 +221,6 @@ gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInte
NMConnection *connection,
GError **error);
#ifdef NM_VPN_LIBNM_COMPAT
#define nm_vpn_editor_plugin_factory nm_vpn_plugin_ui_factory

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

@ -122,7 +122,6 @@ enum {
static GSList *active_plugins = NULL;
GQuark
nm_vpn_plugin_error_quark (void)
{
@ -134,7 +133,6 @@ nm_vpn_plugin_error_quark (void)
return quark;
}
static void
nm_vpn_plugin_set_connection (NMVPNPlugin *plugin,
DBusGConnection *connection)

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

@ -278,7 +278,6 @@ constructed (GObject *object)
register_properties (NM_WIMAX_NSP (object));
}
static void
nm_wimax_nsp_class_init (NMWimaxNspClass *nsp_class)
{

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

@ -1078,7 +1078,6 @@ test_connection_invalid (void)
nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[2]]);
/**************************************************************************
* Modify the invalid connection and make it valid
*************************************************************************/

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

@ -229,7 +229,6 @@ test_make_visible (void)
dbus_g_proxy_begin_call (proxy, "SetVisible", set_visible_cb, NULL, NULL,
G_TYPE_BOOLEAN, TRUE, G_TYPE_INVALID);
/* Wait for the settings service to announce the connection again */
start = time (NULL);
do {

6
libnm-util/NetworkManager.h
View file

@ -66,7 +66,6 @@
#define NM_DBUS_INTERFACE_DEVICE_VXLAN NM_DBUS_INTERFACE_DEVICE ".Vxlan"
#define NM_DBUS_INTERFACE_DEVICE_GRE NM_DBUS_INTERFACE_DEVICE ".Gre"
#define NM_DBUS_IFACE_SETTINGS "org.freedesktop.NetworkManager.Settings"
#define NM_DBUS_PATH_SETTINGS "/org/freedesktop/NetworkManager/Settings"
@ -196,7 +195,6 @@ typedef enum { /*< flags >*/
NM_DEVICE_CAP_IS_SOFTWARE = 0x00000004,
} NMDeviceCapabilities;
/**
* NMDeviceWifiCapabilities:
* @NM_WIFI_DEVICE_CAP_NONE: device has no encryption/authentication capabilities
@ -229,7 +227,6 @@ typedef enum { /*< flags >*/
NM_WIFI_DEVICE_CAP_FREQ_5GHZ = 0x00000400,
} NMDeviceWifiCapabilities;
/**
* NM80211ApFlags:
* @NM_802_11_AP_FLAGS_NONE: access point has no special capabilities
@ -343,7 +340,6 @@ typedef enum { /*< flags >*/
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x00000008,
} NMDeviceModemCapabilities;
/**
* NMDeviceState:
* @NM_DEVICE_STATE_UNKNOWN: the device's state is unknown
@ -398,7 +394,6 @@ typedef enum {
NM_DEVICE_STATE_FAILED = 120,
} NMDeviceState;
/**
* NMDeviceStateReason:
* @NM_DEVICE_STATE_REASON_NONE: No reason given
@ -535,7 +530,6 @@ typedef enum {
NM_DEVICE_STATE_REASON_LAST = 0xFFFF,
} NMDeviceStateReason;
/**
* NMActiveConnectionState:
* @NM_ACTIVE_CONNECTION_STATE_UNKNOWN: the state of the connection is unknown

5
libnm-util/NetworkManagerVPN.h
View file

@ -54,7 +54,6 @@
#define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments"
#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
/*
* VPN daemon signals
*/
@ -89,7 +88,6 @@ typedef enum NMVPNServiceState {
NM_VPN_SERVICE_STATE_STOPPED
} NMVPNServiceState;
/**
* NMVPNConnectionState:
* @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is
@ -177,7 +175,6 @@ typedef enum {
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG
} NMVPNPluginFailure;
/*** Generic config ***/
/* string: VPN interface name (tun0, tap0, etc) */
@ -203,7 +200,6 @@ typedef enum {
*/
#define NM_VPN_PLUGIN_CAN_PERSIST "can-persist"
/*** Ip4Config ***/
/* uint32: IP address of the internal gateway of the subnet the VPN interface is
@ -257,7 +253,6 @@ typedef enum {
#define NM_VPN_PLUGIN_IP4_CONFIG_MTU NM_VPN_PLUGIN_CONFIG_MTU
#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV NM_VPN_PLUGIN_CONFIG_TUNDEV
/*** Ip6Config ***/
/* array of uint8: IP address of the internal gateway of the subnet the VPN interface is

1
libnm-util/crypto.c
View file

@ -40,7 +40,6 @@ _nm_crypto_error_quark (void)
return quark;
}
#define PEM_RSA_KEY_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
#define PEM_RSA_KEY_END "-----END RSA PRIVATE KEY-----"

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

@ -120,10 +120,8 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error);
/*****************************************************************************/
/**
@ -493,7 +491,6 @@ nm_connection_compare (NMConnection *a,
return TRUE;
}
static void
diff_one_connection (NMConnection *a,
NMConnection *b,

3
libnm-util/nm-setting-8021x.c
View file

@ -1342,7 +1342,6 @@ nm_setting_802_1x_remove_phase2_altsubject_match (NMSetting8021x *setting, guint
g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES);
}
/**
* nm_setting_802_1x_remove_phase2_altsubject_match_by_value:
* @setting: the #NMSetting8021x
@ -2535,7 +2534,6 @@ static void need_secrets_phase2 (NMSetting8021x *self,
GPtrArray *secrets,
gboolean phase2);
typedef void (*EAPMethodNeedSecretsFunc) (NMSetting8021x *self,
GPtrArray *secrets,
gboolean phase2);
@ -2601,7 +2599,6 @@ need_secrets_phase2 (NMSetting8021x *self,
}
}
static GPtrArray *
need_secrets (NMSetting *setting)
{

3
libnm-util/nm-setting-8021x.h
View file

@ -65,7 +65,6 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
NM_SETTING_802_1X_CK_SCHEME_PATH
} NMSetting8021xCKScheme;
#define NM_TYPE_SETTING_802_1X (nm_setting_802_1x_get_type ())
#define NM_SETTING_802_1X(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_802_1X, NMSetting8021x))
#define NM_SETTING_802_1X_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_802_1X, NMSetting8021xClass))
@ -91,7 +90,6 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_error >*/
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
GQuark nm_setting_802_1x_error_quark (void);
#define NM_SETTING_802_1X_EAP "eap"
#define NM_SETTING_802_1X_IDENTITY "identity"
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
@ -291,7 +289,6 @@ NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags (
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format (NMSetting8021x *setting);
G_END_DECLS
#endif /* NM_SETTING_8021X_H */

1
libnm-util/nm-setting-bluetooth.c
View file

@ -60,7 +60,6 @@ nm_setting_bluetooth_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingBluetooth, nm_setting_bluetooth, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_BLUETOOTH_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-bond.c
View file

@ -61,7 +61,6 @@ nm_setting_bond_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingBond, nm_setting_bond, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_BOND_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-bridge.c
View file

@ -64,7 +64,6 @@ nm_setting_bridge_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_BRIDGE_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-cdma.c
View file

@ -54,7 +54,6 @@ nm_setting_cdma_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingCdma, nm_setting_cdma, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_CDMA_SETTING_NAME,
g_define_type_id,

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

@ -58,7 +58,6 @@ nm_setting_connection_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingConnection, nm_setting_connection, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_CONNECTION_SETTING_NAME,
g_define_type_id,
@ -273,7 +272,6 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting)
return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->type;
}
/**
* nm_setting_connection_get_num_permissions:
* @setting: the #NMSettingConnection
@ -753,7 +751,6 @@ nm_setting_connection_get_gateway_ping_timeout (NMSettingConnection *setting)
return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->gateway_ping_timeout;
}
static gboolean
verify (NMSetting *setting, GSList *all_settings, GError **error)
{

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

@ -64,7 +64,6 @@ nm_setting_dcb_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingDcb, nm_setting_dcb, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_DCB_SETTING_NAME,
g_define_type_id,

2
libnm-util/nm-setting-dcb.h
View file

@ -88,7 +88,6 @@ typedef enum {
*/
#define NM_SETTING_DCB_FCOE_MODE_VN2VN "vn2vn"
/* Properties */
#define NM_SETTING_DCB_APP_FCOE_FLAGS "app-fcoe-flags"
#define NM_SETTING_DCB_APP_FCOE_PRIORITY "app-fcoe-priority"
@ -110,7 +109,6 @@ typedef enum {
#define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
#define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS "priority-traffic-class"
typedef struct {
NMSetting parent;
} NMSettingDcb;

1
libnm-util/nm-setting-gsm.c
View file

@ -55,7 +55,6 @@ nm_setting_gsm_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_GSM_SETTING_NAME,
g_define_type_id,

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

@ -990,13 +990,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
return TRUE;
}
static void
nm_setting_ip4_config_init (NMSettingIP4Config *setting)
{
NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting);
priv->dns = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
}
@ -1396,7 +1394,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
G_PARAM_STATIC_STRINGS));
}
struct NMIP4Address {
guint32 refcount;
guint32 address; /* network byte order */
@ -1607,7 +1604,6 @@ nm_ip4_address_set_gateway (NMIP4Address *address, guint32 gateway)
address->gateway = gateway;
}
struct NMIP4Route {
guint32 refcount;

1
libnm-util/nm-setting-ip4-config.h
View file

@ -164,7 +164,6 @@ guint32 nm_ip4_route_get_metric (NMIP4Route *route);
void nm_ip4_route_set_metric (NMIP4Route *route,
guint32 metric);
typedef struct {
NMSetting parent;
} NMSettingIP4Config;

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

@ -83,7 +83,6 @@ typedef struct {
NMSettingIP6ConfigPrivacy ip6_privacy;
} NMSettingIP6ConfigPrivate;
enum {
PROP_0,
PROP_METHOD,
@ -174,7 +173,6 @@ nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting, guint32 i)
{
NMSettingIP6ConfigPrivate *priv;
g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), NULL);
priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting);
@ -946,7 +944,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
return TRUE;
}
static void
nm_setting_ip6_config_init (NMSettingIP6Config *setting)
{

2
libnm-util/nm-setting-ip6-config.h
View file

@ -69,7 +69,6 @@ GQuark nm_setting_ip6_config_error_quark (void);
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY "ip6-privacy"
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME "dhcp-hostname"
/**
* NM_SETTING_IP6_CONFIG_METHOD_IGNORE:
*
@ -143,7 +142,6 @@ typedef enum {
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
} NMSettingIP6ConfigPrivacy;
typedef struct NMIP6Address NMIP6Address;
GType nm_ip6_address_get_type (void);

1
libnm-util/nm-setting-ppp.c
View file

@ -53,7 +53,6 @@ nm_setting_ppp_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingPPP, nm_setting_ppp, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_PPP_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-pppoe.c
View file

@ -55,7 +55,6 @@ nm_setting_pppoe_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingPPPOE, nm_setting_pppoe, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_PPPOE_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-private.h
View file

@ -80,7 +80,6 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting,
NMSettingClearSecretsWithFlagsFn func,
gpointer user_data);
/* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
* connection can be replaced by a already-defined connection. This flag only
* takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE

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

@ -55,7 +55,6 @@ nm_setting_serial_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_SERIAL_SETTING_NAME,
g_define_type_id,
@ -73,7 +72,6 @@ typedef struct {
guint64 send_delay;
} NMSettingSerialPrivate;
enum {
PROP_0,
PROP_BAUD,

1
libnm-util/nm-setting-team.c
View file

@ -61,7 +61,6 @@ nm_setting_team_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingTeam, nm_setting_team, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_TEAM_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-vpn.c
View file

@ -63,7 +63,6 @@ nm_setting_vpn_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingVPN, nm_setting_vpn, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_VPN_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-wimax.c
View file

@ -62,7 +62,6 @@ nm_setting_wimax_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_WIMAX_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-wired.c
View file

@ -60,7 +60,6 @@ nm_setting_wired_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_WIRED_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-wireless-security.c
View file

@ -73,7 +73,6 @@ nm_setting_wireless_security_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
g_define_type_id,

1
libnm-util/nm-setting-wireless.c
View file

@ -61,7 +61,6 @@ nm_setting_wireless_error_quark (void)
return quark;
}
G_DEFINE_TYPE_WITH_CODE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_WIRELESS_SETTING_NAME,
g_define_type_id,

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