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

31 files changed, 0 insertions, 64 deletions

diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 5e1c3f9f6d..2aa2e357f4 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -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
diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h
index 756619864f..39a5d9613b 100644
--- a/libnm-util/NetworkManagerVPN.h
+++ b/libnm-util/NetworkManagerVPN.h
@@ -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
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 9778edebcb..5d1a37ffc9 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -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-----"
 
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index b929fdcd1a..726cebdca6 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -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,
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 5cb19818ed..ae7a47e664 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -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)
 {
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
index 3de8f4c37d..b3e1e540a7 100644
--- a/libnm-util/nm-setting-8021x.h
+++ b/libnm-util/nm-setting-8021x.h
@@ -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 */
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c
index db0b3e9278..d26a5b8f07 100644
--- a/libnm-util/nm-setting-bluetooth.c
+++ b/libnm-util/nm-setting-bluetooth.c
@@ -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,
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index f56cb428cf..5a9b963451 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -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,
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index 833728b90a..cc189c5730 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -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,
diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c
index 794945f1c4..fc76be60e1 100644
--- a/libnm-util/nm-setting-cdma.c
+++ b/libnm-util/nm-setting-cdma.c
@@ -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,
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index 28d5fca7bf..e51d2c91da 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -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)
 {
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c
index eaed4ff5d3..2cd0bdafdb 100644
--- a/libnm-util/nm-setting-dcb.c
+++ b/libnm-util/nm-setting-dcb.c
@@ -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,
diff --git a/libnm-util/nm-setting-dcb.h b/libnm-util/nm-setting-dcb.h
index 626f815d91..2757200e9d 100644
--- a/libnm-util/nm-setting-dcb.h
+++ b/libnm-util/nm-setting-dcb.h
@@ -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;
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index fd11ce67f3..82ebde335e 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -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,
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 74f4d3122e..6a01fca926 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -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;
 
diff --git a/libnm-util/nm-setting-ip4-config.h b/libnm-util/nm-setting-ip4-config.h
index 1365de291c..4d50547d79 100644
--- a/libnm-util/nm-setting-ip4-config.h
+++ b/libnm-util/nm-setting-ip4-config.h
@@ -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;
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 1566fe9916..6beeb7da21 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -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)
 {
diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h
index 0a2f00ddcc..2a32a92035 100644
--- a/libnm-util/nm-setting-ip6-config.h
+++ b/libnm-util/nm-setting-ip6-config.h
@@ -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);
diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c
index 54b070be52..3437d1a1f8 100644
--- a/libnm-util/nm-setting-ppp.c
+++ b/libnm-util/nm-setting-ppp.c
@@ -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,
diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c
index 5b729c8552..e66165fd09 100644
--- a/libnm-util/nm-setting-pppoe.c
+++ b/libnm-util/nm-setting-pppoe.c
@@ -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,
diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h
index db5f3afa60..e2e0239885 100644
--- a/libnm-util/nm-setting-private.h
+++ b/libnm-util/nm-setting-private.h
@@ -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
diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c
index 8a4b079d81..369c4b109e 100644
--- a/libnm-util/nm-setting-serial.c
+++ b/libnm-util/nm-setting-serial.c
@@ -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,
diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c
index f5dcdc9442..0ec40320c6 100644
--- a/libnm-util/nm-setting-team.c
+++ b/libnm-util/nm-setting-team.c
@@ -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,
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index e47fe3949c..1fed9eca38 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -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,
diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c
index 60beb91279..102fbb5cf7 100644
--- a/libnm-util/nm-setting-wimax.c
+++ b/libnm-util/nm-setting-wimax.c
@@ -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,
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index 4296d5112d..8b297ee68a 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -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,
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 22808fea7e..00d35a2fe0 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -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,
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index 3341fc8bad..d3040811c8 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -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,
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 760b3cac21..c74d2d7116 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -1329,7 +1329,6 @@ nm_setting_get_virtual_iface_name (NMSetting *setting)
 	return NULL;
 }
 
-
 NMSettingVerifyResult
 _nm_setting_verify_deprecated_virtual_iface_name (const char *interface_name,
                                                   gboolean allow_missing,
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index ce5cf3f529..1470a69b24 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -62,7 +62,6 @@ typedef enum
 #define NM_SETTING_ERROR nm_setting_error_quark ()
 GQuark nm_setting_error_quark (void);
 
-
 /* DEPRECATED AND UNUSED */
 #define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
 
@@ -79,7 +78,6 @@ GQuark nm_setting_error_quark (void);
 
 /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */
 
-
 #define NM_SETTING_NAME "name"
 
 /**
@@ -156,7 +154,6 @@ typedef enum {
 	/* 0x80000000 is used for a private flag */
 } NMSettingCompareFlags;
 
-
 /**
  * NMSetting:
  *
@@ -167,7 +164,6 @@ typedef struct {
 	GObject parent;
 } NMSetting;
 
-
 /**
  * NMSettingClearSecretsWithFlagsFn:
  * @setting: The setting for which secrets are being iterated
@@ -241,7 +237,6 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting,
                                       GParamFlags flags,
                                       gpointer user_data);
 
-
 GType nm_setting_get_type (void);
 
 /**
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 5d80b2a4f8..5840491026 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -127,7 +127,6 @@ static const struct IsoLangToEncodings isoLangEntries2[] =
 	{ NULL, {NULL, NULL, NULL} }
 };
 
-
 static GHashTable * langToEncodings5 = NULL;
 static GHashTable * langToEncodings2 = NULL;
 
@@ -159,7 +158,6 @@ init_lang_to_encodings_hash (void)
 	}
 }
 
-
 static gboolean
 get_encodings_for_lang (const char *lang,
                         char **encoding1,
@@ -1105,7 +1103,6 @@ nm_utils_ip4_prefix_to_netmask (guint32 prefix)
 	return _nm_utils_ip4_prefix_to_netmask (prefix);
 }
 
-
 /**
  * nm_utils_ip4_get_default_prefix:
  * @ip: an IPv4 address (in network byte order)
@@ -1674,7 +1671,6 @@ nm_utils_rsa_key_encrypt (const GByteArray *data,
                           GError **error)
 {
 
-
 	return nm_utils_rsa_key_encrypt_helper (CIPHER_DES_EDE3_CBC,
 	                                        data,
 	                                        in_password,
@@ -2578,7 +2574,6 @@ nm_utils_check_virtual_device_compatibility (GType virtual_type, GType other_typ
 gconstpointer nm_utils_get_private (void);
 gconstpointer nm_util_get_private (void);
 
-
 /**
  * nm_utils_get_private:
  *