diff options
| author | Dan Winship <danw@gnome.org> | 2013-03-07 07:30:23 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-03-07 07:32:27 -0500 |
| commit | 6f44b7f3c6d406a1bda23056c7cad3ded390c02f (patch) | |
| tree | 7261abacc27190136cc5a35983e8c8f4edfce998 /src/supplicant-manager | |
| parent | 0006c6aa1d6d5375c19d98745c5f3514bf0bfc03 (diff) | |
| download | NetworkManager-6f44b7f3c6d406a1bda23056c7cad3ded390c02f.tar.gz | |
all: remove redundant return-if-fail checks
NM_IS_FOO(x) returns FALSE if x is NULL, so we don't need a separate
(x != NULL) check before it.
Diffstat (limited to 'src/supplicant-manager')
| -rw-r--r-- | src/supplicant-manager/nm-supplicant-interface.c | 5 | ||||
| -rw-r--r-- | src/supplicant-manager/nm-supplicant-manager.c | 1 |
2 files changed, 0 insertions, 6 deletions
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)) |