diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-09-25 12:51:55 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-10-02 17:00:36 +0300 |
| commit | 8a2234a2731ea8894c8a23477a12229cd8ec9bc8 (patch) | |
| tree | 7d566b96f6ed6b6e9cf8255a410169423970c664 | |
| parent | d6f61a88237bc1396f1f054393a16e1425f59445 (diff) | |
| download | nautilus-8a2234a2731ea8894c8a23477a12229cd8ec9bc8.tar.gz | |
file: Don’t assert as much
Some (public) functions needlessly assert certain facts about their
parameters, and can just throw warnings and return early, instead.
| -rw-r--r-- | src/nautilus-file.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nautilus-file.c b/src/nautilus-file.c index c62b47a6b..b9451e55a 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -812,12 +812,16 @@ nautilus_file_get_internal (GFile *location, NautilusFile * nautilus_file_get (GFile *location) { + g_return_val_if_fail (G_IS_FILE (location), NULL); + return NAUTILUS_FILE (nautilus_file_get_internal (location, TRUE)); } NautilusFile * nautilus_file_get_existing (GFile *location) { + g_return_val_if_fail (G_IS_FILE (location), NULL); + return NAUTILUS_FILE (nautilus_file_get_internal (location, FALSE)); } @@ -8079,7 +8083,7 @@ nautilus_file_is_remote (NautilusFile *file) { g_autofree char *filesystem_type = NULL; - g_assert (NAUTILUS_IS_FILE (file)); + g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); if (nautilus_file_get_filesystem_remote (file)) { @@ -8106,7 +8110,7 @@ nautilus_file_is_other_locations (NautilusFile *file) gboolean is_other_locations; gchar *uri; - g_assert (NAUTILUS_IS_FILE (file)); + g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); uri = nautilus_file_get_uri (file); is_other_locations = g_strcmp0 (uri, "other-locations:///") == 0; @@ -8130,7 +8134,7 @@ nautilus_file_is_starred_location (NautilusFile *file) { g_autofree gchar *uri = NULL; - g_assert (NAUTILUS_IS_FILE (file)); + g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); uri = nautilus_file_get_uri (file); @@ -8149,7 +8153,7 @@ nautilus_file_is_starred_location (NautilusFile *file) gboolean nautilus_file_is_in_admin (NautilusFile *file) { - g_assert (NAUTILUS_IS_FILE (file)); + g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); return nautilus_directory_is_in_admin (file->details->directory); } |