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 /libnm-util/nm-setting.c | |
| 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 'libnm-util/nm-setting.c')
| -rw-r--r-- | libnm-util/nm-setting.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 21dab0ba6a..0d134ead15 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -104,7 +104,6 @@ nm_setting_to_hash (NMSetting *setting, NMSettingHashFlags flags) guint n_property_specs; guint i; - g_return_val_if_fail (setting != NULL, NULL); g_return_val_if_fail (NM_IS_SETTING (setting), NULL); property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs); @@ -481,7 +480,6 @@ nm_setting_diff (NMSetting *a, gboolean results_created = FALSE; g_return_val_if_fail (results != NULL, FALSE); - g_return_val_if_fail (a != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTING (a), FALSE); if (b) { g_return_val_if_fail (NM_IS_SETTING (b), FALSE); @@ -764,7 +762,6 @@ nm_setting_update_secrets (NMSetting *setting, GHashTable *secrets, GError **err gpointer key, data; GError *tmp_error = NULL; - g_return_val_if_fail (setting != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); g_return_val_if_fail (secrets != NULL, FALSE); if (error) @@ -851,7 +848,6 @@ nm_setting_get_secret_flags (NMSetting *setting, NMSettingSecretFlags *out_flags, GError **error) { - g_return_val_if_fail (setting != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); g_return_val_if_fail (secret_name != NULL, FALSE); @@ -895,7 +891,6 @@ nm_setting_set_secret_flags (NMSetting *setting, NMSettingSecretFlags flags, GError **error) { - g_return_val_if_fail (setting != NULL, FALSE); g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); g_return_val_if_fail (secret_name != NULL, FALSE); g_return_val_if_fail (flags <= NM_SETTING_SECRET_FLAGS_ALL, FALSE); |