diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-27 11:27:43 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-27 11:27:43 +0000 |
commit | d231ce03645fbdc5a3c2886c76dc23ca42e27a2a (patch) | |
tree | e9fc601dadacac34a533d354f5d32097d0a89e8c | |
parent | 59a2235e9d5b39ba61e76ff01a3d37aa9bc244fe (diff) | |
parent | 01d5b41afa48a0e59cddf073b10ac831ccb596c2 (diff) | |
download | glib-d231ce03645fbdc5a3c2886c76dc23ca42e27a2a.tar.gz |
Merge branch '2951-reinstate-fileinfo-criticals' into 'main'
Revert "gfileinfo: Temporarily downgrade missing attribute criticals to debugs"
Closes #2951
See merge request GNOME/glib!3379
-rw-r--r-- | gio/gfileinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c index d9c7d70f9..ca42add8e 100644 --- a/gio/gfileinfo.c +++ b/gio/gfileinfo.c @@ -1500,8 +1500,8 @@ g_file_info_set_attribute_int64 (GFileInfo *info, *value_ptr = g_file_info_find_value (info, attr); \ if (G_UNLIKELY (*value_ptr == NULL)) \ { \ - g_debug ("GFileInfo created without " attribute_name); \ - return error_value; \ + g_critical ("GFileInfo created without " attribute_name); \ + g_return_val_if_reached (error_value); \ } \ } G_STMT_END @@ -1837,9 +1837,9 @@ g_file_info_get_modification_time (GFileInfo *info, if (G_UNLIKELY (value == NULL)) { - g_debug ("GFileInfo created without " G_FILE_ATTRIBUTE_TIME_MODIFIED); + g_critical ("GFileInfo created without " G_FILE_ATTRIBUTE_TIME_MODIFIED); result->tv_sec = result->tv_usec = 0; - return; + g_return_if_reached (); } result->tv_sec = _g_file_attribute_value_get_uint64 (value); |