diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2018-04-30 13:46:24 +0200 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-04-30 16:24:52 +0200 |
commit | 1b5925ce881370a1aba347cea0afe61e6316e81a (patch) | |
tree | 1517885acc27984eefe835331a8de97e208c1b19 /libnm | |
parent | e09b2314b94effae147423faa38cdf49027cd545 (diff) |
all: remove consecutive empty lines
Normalize coding style by removing consecutive empty lines from C
sources and headers.
https://github.com/NetworkManager/NetworkManager/pull/108
Diffstat (limited to 'libnm')
-rw-r--r-- | libnm/nm-access-point.c | 1 | ||||
-rw-r--r-- | libnm/nm-active-connection.c | 1 | ||||
-rw-r--r-- | libnm/nm-checkpoint.c | 1 | ||||
-rw-r--r-- | libnm/nm-client.c | 3 | ||||
-rw-r--r-- | libnm/nm-client.h | 1 | ||||
-rw-r--r-- | libnm/nm-device-adsl.c | 1 | ||||
-rw-r--r-- | libnm/nm-device-macvlan.c | 1 | ||||
-rw-r--r-- | libnm/nm-device.c | 1 | ||||
-rw-r--r-- | libnm/nm-remote-connection.h | 1 | ||||
-rw-r--r-- | libnm/nm-remote-settings.c | 1 | ||||
-rw-r--r-- | libnm/nm-vpn-connection.c | 1 | ||||
-rw-r--r-- | libnm/nm-vpn-plugin-old.c | 1 | ||||
-rw-r--r-- | libnm/nm-vpn-service-plugin.c | 2 | ||||
-rw-r--r-- | libnm/tests/test-nm-client.c | 2 | ||||
-rw-r--r-- | libnm/tests/test-secret-agent.c | 2 |
15 files changed, 0 insertions, 20 deletions
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index 2e6244c6d..ba5bcb830 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -483,7 +483,6 @@ init_dbus (NMObject *object) property_info); } - static void nm_access_point_class_init (NMAccessPointClass *ap_class) { diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index 6560fb8ec..0314667fd 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -580,7 +580,6 @@ init_dbus (NMObject *object) property_info); } - static void nm_active_connection_class_init (NMActiveConnectionClass *ap_class) { diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c index 890e2f851..153a71048 100644 --- a/libnm/nm-checkpoint.c +++ b/libnm/nm-checkpoint.c @@ -163,7 +163,6 @@ init_dbus (NMObject *object) property_info); } - static void nm_checkpoint_class_init (NMCheckpointClass *checkpoint_class) { diff --git a/libnm/nm-client.c b/libnm/nm-client.c index a31a0845e..f74851228 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -754,7 +754,6 @@ nm_client_check_connectivity_finish (NMClient *client, return (NMConnectivityState) g_simple_async_result_get_op_res_gssize (simple); } - /** * nm_client_save_hostname: * @client: the %NMClient @@ -2623,7 +2622,6 @@ obj_nm_inited (GObject *object, GAsyncResult *result, gpointer user_data) } } - static void object_added (GDBusObjectManager *object_manager, GDBusObject *object, gpointer user_data) { @@ -2740,7 +2738,6 @@ objects_created (NMClient *client, GDBusObjectManager *object_manager, GError ** G_CALLBACK (dns_notify), client); } - /* The handlers don't really use the client instance. However * it makes it convenient to unhook them by data. */ g_signal_connect (object_manager, "object-added", diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 6f4a86c95..6259b1227 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -403,7 +403,6 @@ const char *nm_client_get_dns_rc_manager (NMClient *client); NM_AVAILABLE_IN_1_6 const GPtrArray *nm_client_get_dns_configuration (NMClient *client); - NM_AVAILABLE_IN_1_12 const GPtrArray *nm_client_get_checkpoints (NMClient *client); diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c index 3285745dd..a82aa8d06 100644 --- a/libnm/nm-device-adsl.c +++ b/libnm/nm-device-adsl.c @@ -30,7 +30,6 @@ #include "nm-setting-adsl.h" #include "nm-setting-connection.h" - G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE) #define NM_DEVICE_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_ADSL, NMDeviceAdslPrivate)) diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c index e64772198..23c649cc2 100644 --- a/libnm/nm-device-macvlan.c +++ b/libnm/nm-device-macvlan.c @@ -143,7 +143,6 @@ nm_device_macvlan_get_hw_address (NMDeviceMacvlan *device) return nm_str_not_empty (NM_DEVICE_MACVLAN_GET_PRIVATE (device)->hw_address); } - static gboolean connection_compatible (NMDevice *device, NMConnection *connection, GError **error) { diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 9bb8f3912..229d60284 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -1940,7 +1940,6 @@ nm_device_reapply (NMDevice *device, if (!dict) dict = g_variant_new_array (G_VARIANT_TYPE ("{sa{sv}}"), NULL, 0); - ret = nmdbus_device_call_reapply_sync (NM_DEVICE_GET_PRIVATE (device)->proxy, dict, version_id, flags, cancellable, error); if (error && *error) diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h index a729f904f..d5b6a8c4b 100644 --- a/libnm/nm-remote-connection.h +++ b/libnm/nm-remote-connection.h @@ -37,7 +37,6 @@ G_BEGIN_DECLS #define NM_IS_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_CONNECTION)) #define NM_REMOTE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass)) - /* Properties */ #define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection" #define NM_REMOTE_CONNECTION_PATH "path" diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 2339e872a..089a06337 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -533,7 +533,6 @@ nm_remote_settings_save_hostname (NMRemoteSettings *settings, NMRemoteSettingsPrivate *priv; gboolean ret; - g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c index 636c39507..5a3c4e564 100644 --- a/libnm/nm-vpn-connection.c +++ b/libnm/nm-vpn-connection.c @@ -59,7 +59,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - /** * nm_vpn_connection_get_banner: * @vpn: a #NMVpnConnection diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index c5fc615eb..bfafc7b77 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -94,7 +94,6 @@ enum { static GSList *active_plugins = NULL; - static void nm_vpn_plugin_old_set_connection (NMVpnPluginOld *plugin, GDBusConnection *connection) diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 901ffa987..da4c2446c 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -96,7 +96,6 @@ enum { static GSList *active_plugins = NULL; - static void nm_vpn_service_plugin_set_connection (NMVpnServicePlugin *plugin, GDBusConnection *connection) @@ -882,7 +881,6 @@ nm_vpn_service_plugin_get_secret_flags (GHashTable *data, if (!secret_name || !*secret_name) g_return_val_if_reached (FALSE); - s = g_hash_table_lookup (data, nm_construct_name_a ("%s-flags", secret_name, &flag_name_free)); if (!s) diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index 638228821..b40e67dd6 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -1345,10 +1345,8 @@ test_connection_invalid (void) FALSE, &path3); - nmtst_main_loop_run (loop, 1000); - connections = nm_client_get_connections (client); g_assert (connections); diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 25752e9a6..911ef4488 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -526,7 +526,6 @@ test_secret_agent_good (TestSecretAgentData *sadata, gconstpointer test_data) g_assert_cmpint (sadata->secrets_requested, ==, 1); } - static void async_init_cb (GObject *object, GAsyncResult *result, gpointer user_data) { @@ -566,7 +565,6 @@ test_secret_agent_nm_not_running (void) g_main_loop_unref (loop); } - static void registered_changed (GObject *object, GParamSpec *pspec, gpointer user_data) { |