diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dhcp-manager/nm-dhcp-client.c | 14 | ||||
-rw-r--r-- | src/dhcp-manager/nm-dhcp-manager.c | 3 | ||||
-rw-r--r-- | src/firewall-manager/nm-firewall-manager.c | 1 | ||||
-rw-r--r-- | src/ip6-manager/nm-ip6-manager.c | 1 | ||||
-rw-r--r-- | src/modem-manager/nm-modem-generic.c | 2 | ||||
-rw-r--r-- | src/modem-manager/nm-modem-gsm.c | 2 | ||||
-rw-r--r-- | src/modem-manager/nm-modem.c | 12 | ||||
-rw-r--r-- | src/nm-device-bt.c | 5 | ||||
-rw-r--r-- | src/nm-device-modem.c | 2 | ||||
-rw-r--r-- | src/nm-device.c | 24 | ||||
-rw-r--r-- | src/nm-netlink-monitor.c | 3 | ||||
-rw-r--r-- | src/nm-policy.c | 2 | ||||
-rw-r--r-- | src/nm-udev-manager.c | 1 | ||||
-rw-r--r-- | src/nm-wifi-ap.c | 1 | ||||
-rw-r--r-- | src/settings/nm-agent-manager.c | 3 | ||||
-rw-r--r-- | src/settings/nm-default-wired-connection.c | 1 | ||||
-rw-r--r-- | src/settings/nm-secret-agent.c | 6 | ||||
-rw-r--r-- | src/settings/nm-settings-connection.c | 13 | ||||
-rw-r--r-- | src/settings/nm-settings.c | 3 | ||||
-rw-r--r-- | src/supplicant-manager/nm-supplicant-interface.c | 5 | ||||
-rw-r--r-- | src/supplicant-manager/nm-supplicant-manager.c | 1 |
21 files changed, 0 insertions, 105 deletions
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index d8b16f380d..e69195fb99 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -80,7 +80,6 @@ enum { GPid nm_dhcp_client_get_pid (NMDHCPClient *self) { - g_return_val_if_fail (self != NULL, -1); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), -1); return NM_DHCP_CLIENT_GET_PRIVATE (self)->pid; @@ -89,7 +88,6 @@ nm_dhcp_client_get_pid (NMDHCPClient *self) const char * nm_dhcp_client_get_iface (NMDHCPClient *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); return NM_DHCP_CLIENT_GET_PRIVATE (self)->iface; @@ -98,7 +96,6 @@ nm_dhcp_client_get_iface (NMDHCPClient *self) gboolean nm_dhcp_client_get_ipv6 (NMDHCPClient *self) { - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE); return NM_DHCP_CLIENT_GET_PRIVATE (self)->ipv6; @@ -107,7 +104,6 @@ nm_dhcp_client_get_ipv6 (NMDHCPClient *self) const char * nm_dhcp_client_get_uuid (NMDHCPClient *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); return NM_DHCP_CLIENT_GET_PRIVATE (self)->uuid; @@ -188,7 +184,6 @@ stop (NMDHCPClient *self, gboolean release, const GByteArray *duid) { NMDHCPClientPrivate *priv; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DHCP_CLIENT (self)); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); @@ -305,7 +300,6 @@ nm_dhcp_client_start_ip4 (NMDHCPClient *self, { NMDHCPClientPrivate *priv; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); @@ -457,7 +451,6 @@ nm_dhcp_client_start_ip6 (NMDHCPClient *self, NMDHCPClientPrivate *priv; char *escaped; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); @@ -534,7 +527,6 @@ nm_dhcp_client_stop (NMDHCPClient *self, gboolean release) { NMDHCPClientPrivate *priv; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DHCP_CLIENT (self)); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); @@ -700,7 +692,6 @@ nm_dhcp_client_new_options (NMDHCPClient *self, guint32 old_state; guint32 new_state; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DHCP_CLIENT (self)); g_return_if_fail (options != NULL); g_return_if_fail (reason != NULL); @@ -761,7 +752,6 @@ nm_dhcp_client_foreach_option (NMDHCPClient *self, GHashTableIter iter; gpointer iterkey, itervalue; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE); g_return_val_if_fail (func != NULL, FALSE); @@ -1145,7 +1135,6 @@ ip4_options_to_config (NMDHCPClient *self) char *str = NULL; guint32 gwaddr = 0, prefix = 0; - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); @@ -1307,7 +1296,6 @@ nm_dhcp_client_get_ip4_config (NMDHCPClient *self, gboolean test) { NMDHCPClientPrivate *priv; - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); @@ -1345,7 +1333,6 @@ ip6_options_to_config (NMDHCPClient *self) GHashTableIter iter; gpointer key, value; - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); @@ -1415,7 +1402,6 @@ nm_dhcp_client_get_ip6_config (NMDHCPClient *self, gboolean test) { NMDHCPClientPrivate *priv; - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); priv = NM_DHCP_CLIENT_GET_PRIVATE (self); diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 1bd7f98426..91ea7831c1 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -119,7 +119,6 @@ get_client_for_pid (NMDHCPManager *manager, GPid pid) GHashTableIter iter; gpointer value; - g_return_val_if_fail (manager != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_MANAGER (manager), NULL); priv = NM_DHCP_MANAGER_GET_PRIVATE (manager); @@ -144,7 +143,6 @@ get_client_for_iface (NMDHCPManager *manager, GHashTableIter iter; gpointer value; - g_return_val_if_fail (manager != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_MANAGER (manager), NULL); g_return_val_if_fail (iface, NULL); @@ -553,7 +551,6 @@ nm_dhcp_manager_get_lease_config (NMDHCPManager *self, const char *uuid, gboolean ipv6) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL); g_return_val_if_fail (iface != NULL, NULL); g_return_val_if_fail (uuid != NULL, NULL); diff --git a/src/firewall-manager/nm-firewall-manager.c b/src/firewall-manager/nm-firewall-manager.c index c19be5e8ed..e3f48d988c 100644 --- a/src/firewall-manager/nm-firewall-manager.c +++ b/src/firewall-manager/nm-firewall-manager.c @@ -175,7 +175,6 @@ nm_firewall_manager_remove_from_zone (NMFirewallManager *self, void nm_firewall_manager_cancel_call (NMFirewallManager *self, gpointer call) { - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_FIREWALL_MANAGER (self)); dbus_g_proxy_cancel_call (NM_FIREWALL_MANAGER_GET_PRIVATE (self)->proxy, (DBusGProxyCall *) call); diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c index 2d067b187b..784fc10bf3 100644 --- a/src/ip6-manager/nm-ip6-manager.c +++ b/src/ip6-manager/nm-ip6-manager.c @@ -223,7 +223,6 @@ nm_ip6_manager_get_device (NMIP6Manager *manager, int ifindex) { NMIP6ManagerPrivate *priv; - g_return_val_if_fail (manager != NULL, NULL); g_return_val_if_fail (NM_IS_IP6_MANAGER (manager), NULL); priv = NM_IP6_MANAGER_GET_PRIVATE (manager); diff --git a/src/modem-manager/nm-modem-generic.c b/src/modem-manager/nm-modem-generic.c index ad18b18a8d..4816ba98f7 100644 --- a/src/modem-manager/nm-modem-generic.c +++ b/src/modem-manager/nm-modem-generic.c @@ -237,9 +237,7 @@ static_stage3_ip4_config_start (NMModem *self, { NMModemGenericPrivate *priv; - g_return_val_if_fail (self != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_MODEM (self), NM_ACT_STAGE_RETURN_FAILURE); - g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c index be793db9c8..c9a7ce1963 100644 --- a/src/modem-manager/nm-modem-gsm.c +++ b/src/modem-manager/nm-modem-gsm.c @@ -172,7 +172,6 @@ ask_for_pin (NMModemGsm *self, gboolean always_ask) NMModemGsmPrivate *priv; guint32 tries = 0; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_MODEM_GSM (self)); priv = NM_MODEM_GSM_GET_PRIVATE (self); @@ -241,7 +240,6 @@ do_enable (NMModemGsm *self) { DBusGProxy *proxy; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_MODEM_GSM (self), FALSE); NM_MODEM_GSM_GET_PRIVATE (self)->enable_delay_id = 0; diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 34aeccf438..1596472602 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -218,9 +218,7 @@ ppp_stage3_ip4_config_start (NMModem *self, NMActStageReturn ret; guint ip_timeout = 20; - g_return_val_if_fail (self != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_MODEM (self), NM_ACT_STAGE_RETURN_FAILURE); - g_return_val_if_fail (req != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_ACT_REQUEST (req), NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); @@ -281,11 +279,8 @@ nm_modem_stage3_ip4_config_start (NMModem *self, NMActRequest *req; NMActStageReturn ret; - g_return_val_if_fail (self != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_MODEM (self), NM_ACT_STAGE_RETURN_FAILURE); - g_return_val_if_fail (device != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_DEVICE (device), NM_ACT_STAGE_RETURN_FAILURE); - g_return_val_if_fail (device_class != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (NM_IS_DEVICE_CLASS (device_class), NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); @@ -523,9 +518,7 @@ deactivate (NMModem *self, NMDevice *device) NMModemPrivate *priv; int ifindex; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_MODEM (self)); - g_return_if_fail (device != NULL); g_return_if_fail (NM_IS_DEVICE (device)); priv = NM_MODEM_GET_PRIVATE (self); @@ -586,7 +579,6 @@ nm_modem_device_state_changed (NMModem *self, gboolean was_connected = FALSE, warn = TRUE; NMModemPrivate *priv; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_MODEM (self)); if (old_state >= NM_DEVICE_STATE_PREPARE && old_state <= NM_DEVICE_STATE_ACTIVATED) @@ -629,7 +621,6 @@ nm_modem_device_state_changed (NMModem *self, const char * nm_modem_get_uid (NMModem *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_MODEM (self), NULL); return NM_MODEM_GET_PRIVATE (self)->uid; @@ -638,7 +629,6 @@ nm_modem_get_uid (NMModem *self) const char * nm_modem_get_path (NMModem *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_MODEM (self), NULL); return NM_MODEM_GET_PRIVATE (self)->path; @@ -647,7 +637,6 @@ nm_modem_get_path (NMModem *self) const char * nm_modem_get_control_port (NMModem *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_MODEM (self), NULL); return NM_MODEM_GET_PRIVATE (self)->control_port; @@ -656,7 +645,6 @@ nm_modem_get_control_port (NMModem *self) const char * nm_modem_get_data_port (NMModem *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_MODEM (self), NULL); /* The ppp_iface takes precedence over the data interface when PPP is used, diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c index 8a4b2eabb5..6500d3731e 100644 --- a/src/nm-device-bt.c +++ b/src/nm-device-bt.c @@ -112,7 +112,6 @@ nm_bt_error_quark (void) guint32 nm_device_bt_get_capabilities (NMDeviceBt *self) { - g_return_val_if_fail (self != NULL, NM_BT_CAPABILITY_NONE); g_return_val_if_fail (NM_IS_DEVICE_BT (self), NM_BT_CAPABILITY_NONE); return NM_DEVICE_BT_GET_PRIVATE (self)->capabilities; @@ -616,9 +615,7 @@ nm_device_bt_modem_added (NMDeviceBt *self, NMDeviceState state; NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE_BT (self), FALSE); - g_return_val_if_fail (modem != NULL, FALSE); g_return_val_if_fail (NM_IS_MODEM (modem), FALSE); priv = NM_DEVICE_BT_GET_PRIVATE (self); @@ -691,9 +688,7 @@ nm_device_bt_modem_removed (NMDeviceBt *self, NMModem *modem) NMDeviceBtPrivate *priv; NMDeviceState state; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE_BT (self), FALSE); - g_return_val_if_fail (modem != NULL, FALSE); g_return_val_if_fail (NM_IS_MODEM (modem), FALSE); priv = NM_DEVICE_BT_GET_PRIVATE (self); diff --git a/src/nm-device-modem.c b/src/nm-device-modem.c index 24d9cefbfe..3c93c44872 100644 --- a/src/nm-device-modem.c +++ b/src/nm-device-modem.c @@ -196,7 +196,6 @@ modem_connected_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data) NMModem * nm_device_modem_get_modem (NMDeviceModem *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE_MODEM (self), NULL); return NM_DEVICE_MODEM_GET_PRIVATE (self)->modem; @@ -350,7 +349,6 @@ nm_device_modem_new (NMModem *modem, const char *driver) const gchar *type_desc = NULL; const gchar *ip_iface = NULL; - g_return_val_if_fail (modem != NULL, NULL); g_return_val_if_fail (NM_IS_MODEM (modem), NULL); g_return_val_if_fail (driver != NULL, NULL); diff --git a/src/nm-device.c b/src/nm-device.c index 725c54abae..eb38464b19 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -322,7 +322,6 @@ update_accept_ra_save (NMDevice *self) const char *ip_iface; char *new_path; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DEVICE (self)); priv = NM_DEVICE_GET_PRIVATE (self); @@ -358,7 +357,6 @@ update_ip6_privacy_save (NMDevice *self) const char *ip_iface; char *new_path; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DEVICE (self)); priv = NM_DEVICE_GET_PRIVATE (self); @@ -625,7 +623,6 @@ nm_device_set_ip_iface (NMDevice *self, const char *iface) const guint8 * nm_device_get_hw_address (NMDevice *dev, guint *out_len) { - g_return_val_if_fail (dev != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE (dev), NULL); g_return_val_if_fail (out_len != NULL, NULL); g_return_val_if_fail (*out_len == 0, NULL); @@ -768,7 +765,6 @@ nm_device_set_connection_provider (NMDevice *device, NMDevicePrivate *priv; g_return_if_fail (device != NULL); - g_return_if_fail (provider != NULL); g_return_if_fail (NM_IS_CONNECTION_PROVIDER (provider)); priv = NM_DEVICE_GET_PRIVATE (device); @@ -1321,7 +1317,6 @@ nm_device_has_available_connection (NMDevice *self) gboolean nm_device_get_enabled (NMDevice *self) { - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE (self), FALSE); if (NM_DEVICE_GET_CLASS (self)->get_enabled) @@ -1332,7 +1327,6 @@ nm_device_get_enabled (NMDevice *self) void nm_device_set_enabled (NMDevice *self, gboolean enabled) { - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DEVICE (self)); if (NM_DEVICE_GET_CLASS (self)->set_enabled) @@ -1342,7 +1336,6 @@ nm_device_set_enabled (NMDevice *self, gboolean enabled) RfKillType nm_device_get_rfkill_type (NMDevice *self) { - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE (self), FALSE); return NM_DEVICE_GET_PRIVATE (self)->rfkill_type; @@ -1472,9 +1465,7 @@ nm_device_check_connection_compatible (NMDevice *device, NMConnection *connection, GError **error) { - g_return_val_if_fail (device != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); - g_return_val_if_fail (connection != NULL, FALSE); g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); if (NM_DEVICE_GET_CLASS (device)->check_connection_compatible) @@ -1485,7 +1476,6 @@ nm_device_check_connection_compatible (NMDevice *device, gboolean nm_device_can_assume_connections (NMDevice *device) { - g_return_val_if_fail (device != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); return !!NM_DEVICE_GET_CLASS (device)->connection_match_config; @@ -3903,7 +3893,6 @@ nm_device_deactivate (NMDevice *self, NMDeviceStateReason reason) gboolean tried_ipv6 = FALSE; int ifindex, family; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DEVICE (self)); nm_log_info (LOGD_DEVICE, "(%s): deactivating device (reason '%s') [%d]", @@ -4040,9 +4029,7 @@ nm_device_activate (NMDevice *self, NMActRequest *req) NMDevicePrivate *priv; NMConnection *connection; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DEVICE (self)); - g_return_if_fail (req != NULL); g_return_if_fail (NM_IS_ACT_REQUEST (req)); priv = NM_DEVICE_GET_PRIVATE (self); @@ -4135,7 +4122,6 @@ nm_device_can_interrupt_activation (NMDevice *self) NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE (self), NULL); return NM_DEVICE_GET_PRIVATE (self)->dhcp4_config; @@ -4144,7 +4130,6 @@ nm_device_get_dhcp4_config (NMDevice *self) NMIP4Config * nm_device_get_ip4_config (NMDevice *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE (self), NULL); return NM_DEVICE_GET_PRIVATE (self)->ip4_config; @@ -4262,7 +4247,6 @@ nm_device_set_ip6_config (NMDevice *self, NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE (self), NULL); return NM_DEVICE_GET_PRIVATE (self)->dhcp6_config; @@ -4271,7 +4255,6 @@ nm_device_get_dhcp6_config (NMDevice *self) NMIP6Config * nm_device_get_ip6_config (NMDevice *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE (self), NULL); return NM_DEVICE_GET_PRIVATE (self)->ip6_config; @@ -5015,7 +4998,6 @@ nm_device_set_firmware_missing (NMDevice *self, gboolean new_missing) { NMDevicePrivate *priv; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DEVICE (self)); priv = NM_DEVICE_GET_PRIVATE (self); @@ -5389,7 +5371,6 @@ nm_device_queue_state (NMDevice *self, { NMDevicePrivate *priv; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_DEVICE (self)); priv = NM_DEVICE_GET_PRIVATE (self); @@ -5414,7 +5395,6 @@ nm_device_queued_state_peek (NMDevice *self) { NMDevicePrivate *priv; - g_return_val_if_fail (self != NULL, NM_DEVICE_STATE_UNKNOWN); g_return_val_if_fail (NM_IS_DEVICE (self), NM_DEVICE_STATE_UNKNOWN); priv = NM_DEVICE_GET_PRIVATE (self); @@ -5481,7 +5461,6 @@ nm_device_set_managed (NMDevice *device, gboolean nm_device_spec_match_list (NMDevice *device, const GSList *specs) { - g_return_val_if_fail (device != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); if (NM_DEVICE_GET_CLASS (device)->spec_match_list) @@ -5583,7 +5562,6 @@ nm_device_match_ip_config (NMDevice *device, NMConnection *connection) NMConnection * nm_device_connection_match_config (NMDevice *device, const GSList *connections) { - g_return_val_if_fail (device != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE (device), NULL); if (NM_DEVICE_GET_CLASS (device)->connection_match_config) @@ -5616,7 +5594,6 @@ nm_device_hwaddr_matches (NMDevice *device, guint other_hwaddr_len, gboolean fail_if_no_hwaddr) { - g_return_val_if_fail (device != NULL, FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); if (other_hwaddr) g_return_val_if_fail (other_hwaddr_len > 0, FALSE); @@ -5721,7 +5698,6 @@ nm_device_recheck_available_connections (NMDevice *device) NMDevicePrivate *priv; const GSList *connections, *iter; - g_return_if_fail (device != NULL); g_return_if_fail (NM_IS_DEVICE (device)); priv = NM_DEVICE_GET_PRIVATE(device); diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index 65d038d481..a8824a9fe6 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -471,7 +471,6 @@ error: static gboolean open_connection (NMNetlinkMonitor *self, GError **error) { - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_NETLINK_MONITOR (self), FALSE); if (!event_connection_setup (self, error)) @@ -558,7 +557,6 @@ nm_netlink_monitor_request_ip6_info (NMNetlinkMonitor *self, GError **error) { NMNetlinkMonitorPrivate *priv; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_NETLINK_MONITOR (self), FALSE); priv = NM_NETLINK_MONITOR_GET_PRIVATE (self); @@ -635,7 +633,6 @@ nm_netlink_monitor_get_flags_sync (NMNetlinkMonitor *self, struct rtnl_link *filter; int err; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_NETLINK_MONITOR (self), FALSE); g_return_val_if_fail (ifflags != NULL, FALSE); diff --git a/src/nm-policy.c b/src/nm-policy.c index b14b35b4f5..5ab7a35449 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -91,7 +91,6 @@ get_best_ip4_device (NMManager *manager) NMDevice *best = NULL; int best_prio = G_MAXINT; - g_return_val_if_fail (manager != NULL, NULL); g_return_val_if_fail (NM_IS_MANAGER (manager), NULL); devices = nm_manager_get_devices (manager); @@ -164,7 +163,6 @@ get_best_ip6_device (NMManager *manager) NMDevice *best = NULL; int best_prio = G_MAXINT; - g_return_val_if_fail (manager != NULL, NULL); g_return_val_if_fail (NM_IS_MANAGER (manager), NULL); devices = nm_manager_get_devices (manager); diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c index de657e9a0e..a485349589 100644 --- a/src/nm-udev-manager.c +++ b/src/nm-udev-manager.c @@ -523,7 +523,6 @@ nm_udev_manager_query_devices (NMUdevManager *self) GUdevEnumerator *enumerator; GList *devices, *iter; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_UDEV_MANAGER (self)); enumerator = g_udev_enumerator_new (priv->client); diff --git a/src/nm-wifi-ap.c b/src/nm-wifi-ap.c index e6db69209a..9be3de31a7 100644 --- a/src/nm-wifi-ap.c +++ b/src/nm-wifi-ap.c @@ -756,7 +756,6 @@ nm_ap_dump (NMAccessPoint *ap, const char *prefix) { NMAccessPointPrivate *priv; - g_return_if_fail (ap != NULL); g_return_if_fail (NM_IS_AP (ap)); priv = NM_AP_GET_PRIVATE (ap); diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index d9199f51c2..3256e1816c 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -1048,7 +1048,6 @@ nm_agent_manager_get_secrets (NMAgentManager *self, Request *req; g_return_val_if_fail (self != NULL, 0); - g_return_val_if_fail (connection != NULL, 0); g_return_val_if_fail (NM_IS_CONNECTION (connection), 0); g_return_val_if_fail (callback != NULL, 0); @@ -1179,7 +1178,6 @@ nm_agent_manager_save_secrets (NMAgentManager *self, Request *req; g_return_val_if_fail (self != NULL, 0); - g_return_val_if_fail (connection != NULL, 0); g_return_val_if_fail (NM_IS_CONNECTION (connection), 0); nm_log_dbg (LOGD_SETTINGS, @@ -1276,7 +1274,6 @@ nm_agent_manager_delete_secrets (NMAgentManager *self, Request *req; g_return_val_if_fail (self != NULL, 0); - g_return_val_if_fail (connection != NULL, 0); g_return_val_if_fail (NM_IS_CONNECTION (connection), 0); nm_log_dbg (LOGD_SETTINGS, diff --git a/src/settings/nm-default-wired-connection.c b/src/settings/nm-default-wired-connection.c index ff817b58b2..8d383c4115 100644 --- a/src/settings/nm-default-wired-connection.c +++ b/src/settings/nm-default-wired-connection.c @@ -105,7 +105,6 @@ nm_default_wired_connection_new (const GByteArray *mac, g_return_val_if_fail (mac != NULL, NULL); g_return_val_if_fail (mac->len == ETH_ALEN, NULL); - g_return_val_if_fail (device != NULL, NULL); g_return_val_if_fail (NM_IS_DEVICE (device), NULL); g_return_val_if_fail (defname != NULL, NULL); diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index 6bbaf6d775..394aec7aea 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -100,7 +100,6 @@ nm_secret_agent_get_description (NMSecretAgent *agent) { NMSecretAgentPrivate *priv; - g_return_val_if_fail (agent != NULL, NULL); g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL); priv = NM_SECRET_AGENT_GET_PRIVATE (agent); @@ -117,7 +116,6 @@ nm_secret_agent_get_description (NMSecretAgent *agent) const char * nm_secret_agent_get_dbus_owner (NMSecretAgent *agent) { - g_return_val_if_fail (agent != NULL, NULL); g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL); return NM_SECRET_AGENT_GET_PRIVATE (agent)->owner; @@ -126,7 +124,6 @@ nm_secret_agent_get_dbus_owner (NMSecretAgent *agent) const char * nm_secret_agent_get_identifier (NMSecretAgent *agent) { - g_return_val_if_fail (agent != NULL, NULL); g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL); return NM_SECRET_AGENT_GET_PRIVATE (agent)->identifier; @@ -135,7 +132,6 @@ nm_secret_agent_get_identifier (NMSecretAgent *agent) uid_t nm_secret_agent_get_owner_uid (NMSecretAgent *agent) { - g_return_val_if_fail (agent != NULL, G_MAXUINT); g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), G_MAXUINT); return NM_SECRET_AGENT_GET_PRIVATE (agent)->owner_uid; @@ -144,7 +140,6 @@ nm_secret_agent_get_owner_uid (NMSecretAgent *agent) const char * nm_secret_agent_get_owner_username(NMSecretAgent *agent) { - g_return_val_if_fail (agent != NULL, NULL); g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), NULL); return NM_SECRET_AGENT_GET_PRIVATE (agent)->owner_username; @@ -153,7 +148,6 @@ nm_secret_agent_get_owner_username(NMSecretAgent *agent) guint32 nm_secret_agent_get_hash (NMSecretAgent *agent) { - g_return_val_if_fail (agent != NULL, 0); g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), 0); return NM_SECRET_AGENT_GET_PRIVATE (agent)->hash; diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index d3415862d6..59c85ccc41 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -205,7 +205,6 @@ set_visible (NMSettingsConnection *self, gboolean new_visible) gboolean nm_settings_connection_is_visible (NMSettingsConnection *self) { - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (self), FALSE); return NM_SETTINGS_CONNECTION_GET_PRIVATE (self)->visible; @@ -218,7 +217,6 @@ nm_settings_connection_recheck_visibility (NMSettingsConnection *self) NMSettingConnection *s_con; guint32 num, i; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_SETTINGS_CONNECTION (self)); priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self); @@ -269,7 +267,6 @@ nm_settings_connection_check_permission (NMSettingsConnection *self, guint32 num, i; const char *puser; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (self), FALSE); priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self); @@ -383,9 +380,7 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self, GHashTable *new_settings, *hash = NULL; gboolean success = FALSE; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (self), FALSE); - g_return_val_if_fail (new != NULL, FALSE); g_return_val_if_fail (NM_IS_CONNECTION (new), FALSE); priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self); @@ -436,9 +431,7 @@ nm_settings_connection_replace_and_commit (NMSettingsConnection *self, { GError *error = NULL; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_SETTINGS_CONNECTION (self)); - g_return_if_fail (new != NULL); g_return_if_fail (NM_IS_CONNECTION (new)); if (!callback) @@ -465,7 +458,6 @@ nm_settings_connection_commit_changes (NMSettingsConnection *connection, NMSettingsConnectionCommitFunc callback, gpointer user_data) { - g_return_if_fail (connection != NULL); g_return_if_fail (NM_IS_SETTINGS_CONNECTION (connection)); g_return_if_fail (callback != NULL); @@ -487,7 +479,6 @@ nm_settings_connection_delete (NMSettingsConnection *connection, NMSettingsConnectionDeleteFunc callback, gpointer user_data) { - g_return_if_fail (connection != NULL); g_return_if_fail (NM_IS_SETTINGS_CONNECTION (connection)); g_return_if_fail (callback != NULL); @@ -1021,7 +1012,6 @@ check_writable (NMConnection *connection, GError **error) { NMSettingConnection *s_con; - g_return_val_if_fail (connection != NULL, FALSE); g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); s_con = nm_connection_get_setting_connection (connection); @@ -1426,7 +1416,6 @@ gboolean nm_settings_connection_get_timestamp (NMSettingsConnection *connection, guint64 *out_timestamp) { - g_return_val_if_fail (connection != NULL, 0); g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), 0); if (out_timestamp) @@ -1572,7 +1561,6 @@ nm_settings_connection_get_seen_bssids (NMSettingsConnection *connection) char *bssid_str; GSList *bssid_list = NULL; - g_return_val_if_fail (connection != NULL, 0); g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), NULL); g_hash_table_iter_init (&iter, priv->seen_bssids); @@ -1593,7 +1581,6 @@ gboolean nm_settings_connection_has_seen_bssid (NMSettingsConnection *connection, const struct ether_addr *bssid) { - g_return_val_if_fail (connection != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTINGS_CONNECTION (connection), FALSE); g_return_val_if_fail (bssid != NULL, FALSE); diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index b04016116f..4e98744a61 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -203,7 +203,6 @@ nm_settings_for_each_connection (NMSettings *self, GHashTableIter iter; gpointer data; - g_return_if_fail (self != NULL); g_return_if_fail (NM_IS_SETTINGS (self)); g_return_if_fail (for_each_func != NULL); @@ -241,7 +240,6 @@ nm_settings_get_connection_by_uuid (NMSettings *self, const char *uuid) NMSettingsConnection *candidate; GHashTableIter iter; - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_SETTINGS (self), NULL); g_return_val_if_fail (uuid != NULL, NULL); @@ -331,7 +329,6 @@ nm_settings_get_connection_by_path (NMSettings *self, const char *path) { NMSettingsPrivate *priv; - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_SETTINGS (self), NULL); g_return_val_if_fail (path != NULL, NULL); diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 3f7dc44619..92920d31c9 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -690,7 +690,6 @@ nm_supplicant_interface_credentials_reply (NMSupplicantInterface *self, { NMSupplicantInterfacePrivate *priv; - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), FALSE); g_return_val_if_fail (field != NULL, FALSE); g_return_val_if_fail (value != NULL, FALSE); @@ -1442,7 +1441,6 @@ nm_supplicant_interface_state_to_string (guint32 state) const char * nm_supplicant_interface_get_device (NMSupplicantInterface * self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), NULL); return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->dev; @@ -1451,7 +1449,6 @@ nm_supplicant_interface_get_device (NMSupplicantInterface * self) const char * nm_supplicant_interface_get_object_path (NMSupplicantInterface *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), NULL); return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->object_path; @@ -1460,7 +1457,6 @@ nm_supplicant_interface_get_object_path (NMSupplicantInterface *self) const char * nm_supplicant_interface_get_ifname (NMSupplicantInterface *self) { - g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), NULL); return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->dev; @@ -1469,7 +1465,6 @@ nm_supplicant_interface_get_ifname (NMSupplicantInterface *self) guint nm_supplicant_interface_get_max_scan_ssids (NMSupplicantInterface *self) { - g_return_val_if_fail (self != NULL, 0); g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), 0); return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->max_scan_ssids; diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index ac57e8a36b..f9489a44d2 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -210,7 +210,6 @@ check_capabilities (NMSupplicantManager *self) gboolean nm_supplicant_manager_available (NMSupplicantManager *self) { - g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (NM_IS_SUPPLICANT_MANAGER (self), FALSE); if (die_count_exceeded (NM_SUPPLICANT_MANAGER_GET_PRIVATE (self)->die_count)) |