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-glib | |
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-glib')
-rw-r--r-- | libnm-glib/libnm_glib.c | 16 | ||||
-rw-r--r-- | libnm-glib/libnm_glib.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-access-point.c | 1 | ||||
-rw-r--r-- | libnm-glib/nm-access-point.h | 1 | ||||
-rw-r--r-- | libnm-glib/nm-active-connection.c | 1 | ||||
-rw-r--r-- | libnm-glib/nm-device.c | 1 | ||||
-rw-r--r-- | libnm-glib/nm-object.c | 1 | ||||
-rw-r--r-- | libnm-glib/nm-remote-connection.c | 3 | ||||
-rw-r--r-- | libnm-glib/nm-remote-connection.h | 1 | ||||
-rw-r--r-- | libnm-glib/nm-remote-settings.h | 3 | ||||
-rw-r--r-- | libnm-glib/nm-secret-agent.c | 1 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-connection.c | 1 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-plugin-ui-interface.c | 3 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-plugin-ui-interface.h | 4 | ||||
-rw-r--r-- | libnm-glib/nm-vpn-plugin.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-wimax-nsp.c | 1 | ||||
-rw-r--r-- | libnm-glib/tests/test-nm-client.c | 1 | ||||
-rw-r--r-- | libnm-glib/tests/test-remote-settings-client.c | 1 |
18 files changed, 0 insertions, 44 deletions
diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 709d44aa8..1e0725ca1 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -34,7 +34,6 @@ #define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist" - struct libnm_glib_ctx { unsigned char check; @@ -65,12 +64,10 @@ typedef struct libnm_glib_callback gpointer user_data; } libnm_glib_callback; - static void _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx); static DBusConnection * _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context); static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state); - static void _libnm_glib_nm_state_cb (DBusPendingCall *pcall, void *user_data) { @@ -184,7 +181,6 @@ _libnm_glib_call_callbacks (libnm_glib_ctx *ctx) g_mutex_unlock (ctx->callbacks_lock); } - static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state) { @@ -215,7 +211,6 @@ _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state) _libnm_glib_call_callbacks (ctx); } - static DBusHandlerResult _libnm_glib_dbus_filter (DBusConnection *connection, DBusMessage *message, @@ -287,7 +282,6 @@ _libnm_glib_dbus_filter (DBusConnection *connection, return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED); } - /* * libnm_glib_dbus_init * @@ -339,7 +333,6 @@ _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context) return (connection); } - /* * libnm_glib_dbus_watcher * @@ -378,7 +371,6 @@ _libnm_glib_dbus_watcher (gpointer user_data) return FALSE; } - /* * libnm_glib_schedule_dbus_watcher * @@ -400,7 +392,6 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx) } } - /* * libnm_glib_dbus_worker * @@ -431,7 +422,6 @@ _libnm_glib_dbus_worker (gpointer user_data) return NULL; } - static void _libnm_glib_ctx_free (libnm_glib_ctx *ctx) { @@ -468,7 +458,6 @@ _libnm_glib_ctx_free (libnm_glib_ctx *ctx) g_free (ctx); } - static libnm_glib_ctx * _libnm_glib_ctx_new (void) { @@ -489,7 +478,6 @@ error: return NULL; } - libnm_glib_ctx * libnm_glib_init (void) { @@ -517,7 +505,6 @@ error: return NULL; } - void libnm_glib_shutdown (libnm_glib_ctx *ctx) { @@ -530,7 +517,6 @@ libnm_glib_shutdown (libnm_glib_ctx *ctx) _libnm_glib_ctx_free (ctx); } - libnm_glib_state libnm_glib_get_network_state (const libnm_glib_ctx *ctx) { @@ -540,7 +526,6 @@ libnm_glib_get_network_state (const libnm_glib_ctx *ctx) return ctx->nm_state; } - guint libnm_glib_register_callback (libnm_glib_ctx *ctx, libnm_glib_callback_func func, @@ -568,7 +553,6 @@ libnm_glib_register_callback (libnm_glib_ctx *ctx, return (callback->id); } - void libnm_glib_unregister_callback (libnm_glib_ctx *ctx, guint id) diff --git a/libnm-glib/libnm_glib.h b/libnm-glib/libnm_glib.h index 01c055d01..4137a8ca4 100644 --- a/libnm-glib/libnm_glib.h +++ b/libnm-glib/libnm_glib.h @@ -41,10 +41,8 @@ typedef enum libnm_glib_state typedef struct libnm_glib_ctx libnm_glib_ctx G_GNUC_DEPRECATED; - typedef void (*libnm_glib_callback_func) (libnm_glib_ctx *libnm_ctx, gpointer user_data) G_GNUC_DEPRECATED; - G_GNUC_DEPRECATED libnm_glib_ctx * libnm_glib_init (void); G_GNUC_DEPRECATED void libnm_glib_shutdown (libnm_glib_ctx *ctx); diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 3b923aa28..88cb375fa 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -563,7 +563,6 @@ constructed (GObject *object) register_properties (NM_ACCESS_POINT (object)); } - static void nm_access_point_class_init (NMAccessPointClass *ap_class) { diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h index 5750c76c5..e9a3fc6b5 100644 --- a/libnm-glib/nm-access-point.h +++ b/libnm-glib/nm-access-point.h @@ -51,7 +51,6 @@ G_BEGIN_DECLS /* DEPRECATED */ #define NM_ACCESS_POINT_HW_ADDRESS "hw-address" - typedef struct { NMObject parent; } NMAccessPoint; diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index aa79e1ac0..a8150755a 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -638,7 +638,6 @@ constructed (GObject *object) register_properties (NM_ACTIVE_CONNECTION (object)); } - static void nm_active_connection_class_init (NMActiveConnectionClass *ap_class) { diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index c340d5e51..d6b3c398d 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -1311,7 +1311,6 @@ nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect) g_value_init (&value, G_TYPE_BOOLEAN); g_value_set_boolean (&value, autoconnect); - NM_DEVICE_GET_PRIVATE (device)->autoconnect = autoconnect; _nm_object_set_property (NM_OBJECT (device), diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index d3f8c830e..56db7e3cd 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -1374,7 +1374,6 @@ _nm_object_suppress_property_updates (NMObject *object, gboolean suppress) priv->suppress_property_updates = suppress; } - void _nm_object_ensure_inited (NMObject *object) { diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 820f9e5ca..eb99ef355 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -67,7 +67,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; typedef struct RemoteCall RemoteCall; typedef void (*RemoteCallFetchResultCb) (RemoteCall *call, DBusGProxyCall *proxy_call, GError *error); - struct RemoteCall { NMRemoteConnection *self; DBusGProxyCall *call; @@ -390,7 +389,6 @@ get_secrets_cb (RemoteCall *call, DBusGProxyCall *proxy_call, GError *error) g_hash_table_destroy (secrets); } - /** * nm_remote_connection_get_secrets: * @connection: the #NMRemoteConnection @@ -708,7 +706,6 @@ init_async (GAsyncInitable *initable, int io_priority, NMRemoteConnectionInitData *init_data; NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (initable); - init_data = g_slice_new0 (NMRemoteConnectionInitData); init_data->connection = NM_REMOTE_CONNECTION (initable); init_data->result = g_simple_async_result_new (G_OBJECT (initable), callback, diff --git a/libnm-glib/nm-remote-connection.h b/libnm-glib/nm-remote-connection.h index 5b746a445..1f951cfa2 100644 --- a/libnm-glib/nm-remote-connection.h +++ b/libnm-glib/nm-remote-connection.h @@ -36,7 +36,6 @@ G_BEGIN_DECLS #define NM_IS_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_CONNECTION)) #define NM_REMOTE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass)) - /** * NMRemoteConnectionError: * @NM_REMOTE_CONNECTION_ERROR_UNKNOWN: unknown or unclassified error diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h index af6cc6036..2f9e00a08 100644 --- a/libnm-glib/nm-remote-settings.h +++ b/libnm-glib/nm-remote-settings.h @@ -59,7 +59,6 @@ typedef enum { #define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark () GQuark nm_remote_settings_error_quark (void); - #define NM_REMOTE_SETTINGS_BUS "bus" #define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running" #define NM_REMOTE_SETTINGS_HOSTNAME "hostname" @@ -71,7 +70,6 @@ GQuark nm_remote_settings_error_quark (void); typedef struct _NMRemoteSettings NMRemoteSettings; typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass; - typedef void (*NMRemoteSettingsAddConnectionFunc) (NMRemoteSettings *settings, NMRemoteConnection *connection, GError *error, @@ -86,7 +84,6 @@ typedef void (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings, GError *error, gpointer user_data); - struct _NMRemoteSettings { GObject parent; }; diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 69c81d072..16e3199dd 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -98,7 +98,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - /*****************************************************************************/ GQuark diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index 7670d2efd..68f495a96 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -55,7 +55,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - /** * nm_vpn_connection_new: * @connection: the #DBusGConnection diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c index f06e77c42..ec554e6ca 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.c +++ b/libnm-glib/nm-vpn-plugin-ui-interface.c @@ -69,7 +69,6 @@ interface_init (gpointer g_iface) initialized = TRUE; } - GType nm_vpn_plugin_ui_interface_get_type (void) { @@ -99,7 +98,6 @@ nm_vpn_plugin_ui_interface_get_type (void) return vpn_plugin_ui_interface_type; } - NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface, NMConnection *connection, @@ -167,7 +165,6 @@ nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface, return TRUE; } - static void widget_interface_init (gpointer g_iface) { diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h index bc5d84360..7d870128c 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.h +++ b/libnm-glib/nm-vpn-plugin-ui-interface.h @@ -37,7 +37,6 @@ typedef struct _NMVpnPluginUiWidgetInterface NMVpnPluginUiWidgetInterface; typedef NMVpnPluginUiInterface * (*NMVpnPluginUiFactory) (GError **error); NMVpnPluginUiInterface *nm_vpn_plugin_ui_factory (GError **error); - /*****************************************************************************/ /* Plugin interface */ /*****************************************************************************/ @@ -93,7 +92,6 @@ typedef enum { NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE } NMVpnPluginUiInterfaceProp; - struct _NMVpnPluginUiInterface { GTypeInterface g_iface; @@ -173,7 +171,6 @@ gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *i NMConnection *connection, GError **error); - /*****************************************************************************/ /* UI widget interface */ /*****************************************************************************/ @@ -224,7 +221,6 @@ gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInte NMConnection *connection, GError **error); - #ifdef NM_VPN_LIBNM_COMPAT #define nm_vpn_editor_plugin_factory nm_vpn_plugin_ui_factory diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 316939ca9..c7c68a8dd 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -122,7 +122,6 @@ enum { static GSList *active_plugins = NULL; - GQuark nm_vpn_plugin_error_quark (void) { @@ -134,7 +133,6 @@ nm_vpn_plugin_error_quark (void) return quark; } - static void nm_vpn_plugin_set_connection (NMVPNPlugin *plugin, DBusGConnection *connection) diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index 9e36e5b9d..d0ab1f5c0 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -278,7 +278,6 @@ constructed (GObject *object) register_properties (NM_WIMAX_NSP (object)); } - static void nm_wimax_nsp_class_init (NMWimaxNspClass *nsp_class) { diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index b6b5968b3..943252033 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -1078,7 +1078,6 @@ test_connection_invalid (void) nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0); nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[2]]); - /************************************************************************** * Modify the invalid connection and make it valid *************************************************************************/ diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index 57bc4faa6..0f3492981 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -229,7 +229,6 @@ test_make_visible (void) dbus_g_proxy_begin_call (proxy, "SetVisible", set_visible_cb, NULL, NULL, G_TYPE_BOOLEAN, TRUE, G_TYPE_INVALID); - /* Wait for the settings service to announce the connection again */ start = time (NULL); do { |