From da2ca5896d9a0ce1ead4af6dde295c5cfa2892df Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 19 Nov 2009 22:02:04 -0500 Subject: Kill e_util_read_file(). --- e-util/e-util.c | 81 --------------------------------------------------------- e-util/e-util.h | 5 ---- 2 files changed, 86 deletions(-) (limited to 'e-util') diff --git a/e-util/e-util.c b/e-util/e-util.c index 800974577c..330419c4d4 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1418,87 +1418,6 @@ e_util_guess_mime_type (const gchar *filename, gboolean localfile) return mime_type; } -/** - * e_util_read_file: - * @filename: File name to read. - * @filename_is_uri: Whether the file name is URI, if not, then it's a local path. - * @buffer: Read content or the file. Should not be NULL. Returned value should be freed with g_free. - * @read: Number of actually read bytes. Should not be NULL. - * @error: Here will be returned an error from reading operations. Can be NULL. Not every time is set when returned FALSE. - * - * Reads synchronously content of the file, to which is pointed either by path or by URI. - * Mount point should be already mounted when calling this function. - * - * Returns: Whether was reading successful or not. - **/ -gboolean -e_util_read_file (const gchar *filename, gboolean filename_is_uri, gchar **buffer, gsize *read, GError **error) -{ - GFile *file; - GFileInfo *info; - GError *err = NULL; - gboolean res = FALSE; - - g_return_val_if_fail (filename != NULL, FALSE); - g_return_val_if_fail (buffer != NULL, FALSE); - g_return_val_if_fail (read != NULL, FALSE); - - *buffer = NULL; - *read = 0; - - if (filename_is_uri) - file = g_file_new_for_uri (filename); - else - file = g_file_new_for_path (filename); - - g_return_val_if_fail (file != NULL, FALSE); - - info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE, NULL, &err); - - if (!err && info) { - guint64 sz; - gchar *buff; - - sz = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); - buff = g_malloc (sizeof (gchar) * sz); - - if (buff) { - GInputStream *stream; - - stream = G_INPUT_STREAM (g_file_read (file, NULL, &err)); - - if (!err && stream) { - res = g_input_stream_read_all (stream, buff, sz, read, NULL, &err); - - if (err) - res = FALSE; - - if (res) - *buffer = buff; - else - g_free (buff); - } - - if (stream) - g_object_unref (stream); - } - } - - if (info) - g_object_unref (info); - - g_object_unref (file); - - if (err) { - if (error) - *error = err; - else - g_error_free (err); - } - - return res; -} - GSList * e_util_get_category_filter_options (void) { diff --git a/e-util/e-util.h b/e-util/e-util.h index 7c4be25bd4..276d20f310 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -143,11 +143,6 @@ gboolean e_file_lock_exists (void); gchar * e_util_guess_mime_type (const gchar *filename, gboolean localfile); -gboolean e_util_read_file (const gchar *filename, - gboolean filename_is_uri, - gchar **buffer, - gsize *read, - GError **error); GSList * e_util_get_category_filter_options (void); -- cgit v1.2.3