gthumb r2403 - in trunk: . libgthumb
- From: mjc svn gnome org
- To: svn-commits-list gnome org
- Subject: gthumb r2403 - in trunk: . libgthumb
- Date: Thu, 21 Aug 2008 16:49:34 +0000 (UTC)
Author: mjc
Date: Thu Aug 21 16:49:34 2008
New Revision: 2403
URL: http://svn.gnome.org/viewvc/gthumb?rev=2403&view=rev
Log:
2008-08-21 Michael J. Chudobiak <mjc svn gnome org>
* libgthumb/gfile-utils.c:
Ran "astyle --style=linux" to tidy up the code. No functional changes.
Modified:
trunk/ChangeLog
trunk/libgthumb/gfile-utils.c
Modified: trunk/libgthumb/gfile-utils.c
==============================================================================
--- trunk/libgthumb/gfile-utils.c (original)
+++ trunk/libgthumb/gfile-utils.c Thu Aug 21 16:49:34 2008
@@ -43,67 +43,67 @@
char *
gfile_get_uri (GFile *file)
{
- return g_file_get_uri (file);
+ return g_file_get_uri (file);
}
char *
gfile_get_path (GFile *file)
{
- char *escaped, *unescaped;
+ char *escaped, *unescaped;
- escaped = g_file_get_path (file);
- unescaped = g_uri_unescape_string (escaped, NULL);
-
- g_free (escaped);
-
- return unescaped;
+ escaped = g_file_get_path (file);
+ unescaped = g_uri_unescape_string (escaped, NULL);
+
+ g_free (escaped);
+
+ return unescaped;
}
/* Debug */
-void
+void
gfile_debug (const char *cfile,
- int line,
- const char *function,
- const char *msg,
- GFile *file)
-{
- char *uri;
- char *dbg;
-
- if (file == NULL)
- uri = g_strdup ("(null)");
- else
- uri = gfile_get_uri (file);
-
- dbg = g_strdup_printf ("%s: %s\n", msg, uri);
-
- debug (cfile, line, function, dbg);
-
+ int line,
+ const char *function,
+ const char *msg,
+ GFile *file)
+{
+ char *uri;
+ char *dbg;
+
+ if (file == NULL)
+ uri = g_strdup ("(null)");
+ else
+ uri = gfile_get_uri (file);
+
+ dbg = g_strdup_printf ("%s: %s\n", msg, uri);
+
+ debug (cfile, line, function, dbg);
+
g_free (uri);
g_free (dbg);
}
-void
+void
gfile_warning (const char *msg,
- GFile *file,
- GError *err)
+ GFile *file,
+ GError *err)
{
- char *uri;
- char *warning;
-
- uri = gfile_get_uri (file);
-
- if (err == NULL)
- warning = g_strdup_printf ("%s: file %s", msg, uri);
- else
- warning = g_strdup_printf ("%s: file %s: %s", msg, uri, err->message);
-
- g_warning ("%s\n", warning);
-
+ char *uri;
+ char *warning;
+
+ uri = gfile_get_uri (file);
+
+ if (err == NULL)
+ warning = g_strdup_printf ("%s: file %s", msg, uri);
+ else
+ warning = g_strdup_printf ("%s: file %s: %s", msg, uri, err->message);
+
+ g_warning ("%s\n", warning);
+
g_free (uri);
g_free (warning);
}
@@ -114,21 +114,21 @@
GFile *
gfile_new (const char *path)
{
- GFile *file;
- char *uri;
-
- g_assert (path != NULL);
-
- if (strstr (path, "://") == NULL)
- uri = g_strconcat ("file://", path, NULL);
- else
- uri = g_strdup (path);
-
- file = g_file_new_for_uri (uri);
-
- g_free (uri);
-
- return file;
+ GFile *file;
+ char *uri;
+
+ g_assert (path != NULL);
+
+ if (strstr (path, "://") == NULL)
+ uri = g_strconcat ("file://", path, NULL);
+ else
+ uri = g_strdup (path);
+
+ file = g_file_new_for_uri (uri);
+
+ g_free (uri);
+
+ return file;
}
@@ -136,29 +136,29 @@
gfile_new_va (const char *path,
...)
{
- va_list args;
- GFile *file;
- char *pathx;
-
- g_assert (path != NULL);
-
- file = gfile_new (path);
-
- va_start (args, path);
-
- while ((pathx = va_arg (args, char*)) != NULL) {
- GFile *tmp;
-
- tmp = g_file_dup (file);
- g_object_unref (file);
-
- file = g_file_resolve_relative_path (tmp, pathx);
- g_object_unref (tmp);
- }
-
- va_end (args);
+ va_list args;
+ GFile *file;
+ char *pathx;
+
+ g_assert (path != NULL);
+
+ file = gfile_new (path);
+
+ va_start (args, path);
+
+ while ((pathx = va_arg (args, char*)) != NULL) {
+ GFile *tmp;
- return file;
+ tmp = g_file_dup (file);
+ g_object_unref (file);
+
+ file = g_file_resolve_relative_path (tmp, pathx);
+ g_object_unref (tmp);
+ }
+
+ va_end (args);
+
+ return file;
}
@@ -166,40 +166,40 @@
GFile *
gfile_append_path (GFile *dir,
- const char *path,
+ const char *path,
...)
{
- va_list args;
- GFile *file;
- char *pathx;
-
- if (path == NULL)
- return g_file_dup (dir);
-
- file = g_file_resolve_relative_path (dir, path);
-
- va_start (args, path);
-
- while ((pathx = va_arg (args, char*)) != NULL) {
- GFile *tmp;
-
- tmp = g_file_dup (file);
- g_object_unref (file);
-
- file = g_file_resolve_relative_path (tmp, pathx);
- g_object_unref (tmp);
- }
-
- va_end (args);
+ va_list args;
+ GFile *file;
+ char *pathx;
+
+ if (path == NULL)
+ return g_file_dup (dir);
+
+ file = g_file_resolve_relative_path (dir, path);
- return file;
+ va_start (args, path);
+
+ while ((pathx = va_arg (args, char*)) != NULL) {
+ GFile *tmp;
+
+ tmp = g_file_dup (file);
+ g_object_unref (file);
+
+ file = g_file_resolve_relative_path (tmp, pathx);
+ g_object_unref (tmp);
+ }
+
+ va_end (args);
+
+ return file;
}
gboolean
gfile_is_local (GFile *file)
{
- return g_file_has_uri_scheme (file, "file");
+ return g_file_has_uri_scheme (file, "file");
}
@@ -207,23 +207,23 @@
char *
gfile_get_filename_extension (GFile *file)
{
- char *basename;
- char *last_dot;
- char *extension;
-
- basename = g_file_get_basename (file);
-
- g_assert (basename != NULL);
-
- last_dot = strrchr (basename, '.');
- if (last_dot == NULL)
- return NULL;
-
- extension = g_strdup (last_dot + 1);
-
- g_free (basename);
-
- return extension;
+ char *basename;
+ char *last_dot;
+ char *extension;
+
+ basename = g_file_get_basename (file);
+
+ g_assert (basename != NULL);
+
+ last_dot = strrchr (basename, '.');
+ if (last_dot == NULL)
+ return NULL;
+
+ extension = g_strdup (last_dot + 1);
+
+ g_free (basename);
+
+ return extension;
}
@@ -231,168 +231,165 @@
gfile_get_file_mime_type (GFile *file,
gboolean fast_file_type)
{
- const char *value;
- const char *result = NULL;
- GFileInfo *info;
- GError *error = NULL;
-
- g_assert (file != NULL);
-
- info = g_file_query_info (file,
- fast_file_type ?
- G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE :
- G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
- G_FILE_QUERY_INFO_NONE,
- NULL,
- &error);
+ const char *value;
+ const char *result = NULL;
+ GFileInfo *info;
+ GError *error = NULL;
+
+ g_assert (file != NULL);
+
+ info = g_file_query_info (file,
+ fast_file_type ?
+ G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE :
+ G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &error);
if (info != NULL) {
- if (fast_file_type)
- value = g_file_info_get_attribute_string (info,
- G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
- else
- value = g_file_info_get_content_type (info);
-
- /*
- * If the file content is determined to be binary data (octet-stream), check for
- * HDR file types, which are not well represented in the freedesktop mime database
- * currently. This section can be purged when they are. This is an unpleasant hack.
- * Some file extensions may be missing here; please file a bug if they are.
- */
- if (strcmp (value, "application/octet-stream") == 0) {
-
- char* extension;
-
- extension = gfile_get_filename_extension (file);
-
- if (extension != NULL) {
- if ( !strcasecmp (extension, "exr") /* OpenEXR format */
- || !strcasecmp (extension, "hdr") /* Radiance rgbe */
- || !strcasecmp (extension, "pic")) /* Radiance rgbe */
- value = "image/x-hdr";
-
- g_free (extension);
- }
- }
-
+ if (fast_file_type)
+ value = g_file_info_get_attribute_string (info,
+ G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+ else
+ value = g_file_info_get_content_type (info);
+
+ /*
+ * If the file content is determined to be binary data (octet-stream), check for
+ * HDR file types, which are not well represented in the freedesktop mime database
+ * currently. This section can be purged when they are. This is an unpleasant hack.
+ * Some file extensions may be missing here; please file a bug if they are.
+ */
+ if (strcmp (value, "application/octet-stream") == 0) {
+
+ char* extension;
+
+ extension = gfile_get_filename_extension (file);
+
+ if (extension != NULL) {
+ if ( !strcasecmp (extension, "exr") /* OpenEXR format */
+ || !strcasecmp (extension, "hdr") /* Radiance rgbe */
+ || !strcasecmp (extension, "pic")) /* Radiance rgbe */
+ value = "image/x-hdr";
+
+ g_free (extension);
+ }
+ }
- result = get_static_string (value);
- }
- else {
+
+ result = get_static_string (value);
+ } else {
gfile_warning ("Could not get content type", file, error);
g_clear_error (&error);
}
g_object_unref (info);
-
- return result;
+
+ return result;
}
static gboolean
_gfile_image_is_type (GFile *file,
- const char *mime_type,
- gboolean fast_file_type)
+ const char *mime_type,
+ gboolean fast_file_type)
{
- const char *result;
-
- result = gfile_get_file_mime_type (file, fast_file_type);
-
- if (result == NULL)
- return FALSE;
-
- return (strcmp (result, mime_type) == 0);
+ const char *result;
+
+ result = gfile_get_file_mime_type (file, fast_file_type);
+
+ if (result == NULL)
+ return FALSE;
+
+ return (strcmp (result, mime_type) == 0);
}
static gboolean
_gfile_image_is_type__gconf_file_type (GFile *file,
- const char *mime_type)
+ const char *mime_type)
{
- return _gfile_image_is_type (file,
- mime_type,
- ! gfile_is_local (file)
- || eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE));
+ return _gfile_image_is_type (file,
+ mime_type,
+ ! gfile_is_local (file)
+ || eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE));
}
gboolean
gfile_image_is_jpeg (GFile *file)
{
- return _gfile_image_is_type__gconf_file_type (file, "image/jpeg");
+ return _gfile_image_is_type__gconf_file_type (file, "image/jpeg");
}
gboolean
gfile_image_is_gif (GFile *file)
{
- return _gfile_image_is_type__gconf_file_type (file, "image/gif");
+ return _gfile_image_is_type__gconf_file_type (file, "image/gif");
}
static gboolean
gfile_is_filetype (GFile *file,
- GFileType file_type)
+ GFileType file_type)
{
- gboolean result = FALSE;
- GFileInfo *info;
- GError *error = NULL;
-
- if (! g_file_query_exists (file, NULL))
- return FALSE;
-
- info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_STANDARD_TYPE,
- G_FILE_QUERY_INFO_NONE,
- NULL,
- &error);
- if (error == NULL) {
- result = (g_file_info_get_file_type (info) == file_type);
- }
- else {
- gfile_warning ("Failed to get file type", file, error);
- g_error_free (error);
- }
+ gboolean result = FALSE;
+ GFileInfo *info;
+ GError *error = NULL;
+
+ if (! g_file_query_exists (file, NULL))
+ return FALSE;
+
+ info = g_file_query_info (file,
+ G_FILE_ATTRIBUTE_STANDARD_TYPE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &error);
+ if (error == NULL) {
+ result = (g_file_info_get_file_type (info) == file_type);
+ } else {
+ gfile_warning ("Failed to get file type", file, error);
+ g_error_free (error);
+ }
- g_object_unref (info);
+ g_object_unref (info);
- return result;
+ return result;
}
gboolean
gfile_path_is_file (GFile *file)
{
- return gfile_is_filetype (file, G_FILE_TYPE_REGULAR);
+ return gfile_is_filetype (file, G_FILE_TYPE_REGULAR);
}
gboolean
gfile_path_is_dir (GFile *file)
{
- return gfile_is_filetype (file, G_FILE_TYPE_DIRECTORY);
+ return gfile_is_filetype (file, G_FILE_TYPE_DIRECTORY);
}
goffset
gfile_get_file_size (GFile *file)
{
- GFileInfo *info;
- goffset size = 0;
- GError *err = NULL;
-
- //FIXME: shouldn't we get rid of this test and fix the callers instead?
- if (file == NULL)
- return 0;
-
- info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_STANDARD_SIZE,
- G_FILE_QUERY_INFO_NONE,
- NULL,
- &err);
+ GFileInfo *info;
+ goffset size = 0;
+ GError *err = NULL;
+
+ //FIXME: shouldn't we get rid of this test and fix the callers instead?
+ if (file == NULL)
+ return 0;
+
+ info = g_file_query_info (file,
+ G_FILE_ATTRIBUTE_STANDARD_SIZE,
+ G_FILE_QUERY_INFO_NONE,
+ NULL,
+ &err);
if (err == NULL) {
size = g_file_info_get_size (info);
- }
- else {
+ } else {
gfile_warning ("Failed to get file size", file, err);
g_error_free (err);
}
@@ -407,111 +404,110 @@
static gboolean
_gfile_make_directory_tree (GFile *dir,
- mode_t mode,
- GError **error)
+ mode_t mode,
+ GError **error)
{
- gboolean success = TRUE;
- GFile *parent;
+ gboolean success = TRUE;
+ GFile *parent;
+
+ parent = g_file_get_parent (dir);
+ if (parent != NULL) {
+ success = _gfile_make_directory_tree (parent, mode, error);
+ g_object_unref (parent);
+ if (! success)
+ return FALSE;
+ }
+
+ success = g_file_make_directory (dir, NULL, error);
+ if ((error != NULL) && (*error != NULL) && g_error_matches (*error, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
+ g_clear_error (error);
+ success = TRUE;
+ }
- parent = g_file_get_parent (dir);
- if (parent != NULL) {
- success = _gfile_make_directory_tree (parent, mode, error);
- g_object_unref (parent);
- if (! success)
- return FALSE;
- }
-
- success = g_file_make_directory (dir, NULL, error);
- if ((error != NULL) && (*error != NULL) && g_error_matches (*error, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
- g_clear_error (error);
- success = TRUE;
- }
-
- if (success)
- g_file_set_attribute_uint32 (dir,
- G_FILE_ATTRIBUTE_UNIX_MODE,
- mode,
- 0,
- NULL,
- NULL);
+ if (success)
+ g_file_set_attribute_uint32 (dir,
+ G_FILE_ATTRIBUTE_UNIX_MODE,
+ mode,
+ 0,
+ NULL,
+ NULL);
- return success;
+ return success;
}
gboolean
gfile_ensure_dir_exists (GFile *dir,
- mode_t mode,
- GError **error)
+ mode_t mode,
+ GError **error)
{
- GError *priv_error = NULL;
+ GError *priv_error = NULL;
- //FIXME: shouldn't we get rid of this test and fix the callers instead?
- if (dir == NULL)
- return FALSE;
-
- if (error == NULL)
- error = &priv_error;
-
- if (! _gfile_make_directory_tree (dir, mode, error)) {
-
- gfile_warning ("could not create directory", dir, *error);
- if (priv_error != NULL)
- g_clear_error (&priv_error);
-
- return FALSE;
- }
+ //FIXME: shouldn't we get rid of this test and fix the callers instead?
+ if (dir == NULL)
+ return FALSE;
- return TRUE;
+ if (error == NULL)
+ error = &priv_error;
+
+ if (! _gfile_make_directory_tree (dir, mode, error)) {
+
+ gfile_warning ("could not create directory", dir, *error);
+ if (priv_error != NULL)
+ g_clear_error (&priv_error);
+
+ return FALSE;
+ }
+
+ return TRUE;
}
guint64
gfile_get_destination_free_space (GFile *file)
{
- guint64 freespace = 0;
- GFileInfo *info;
- GError *err = NULL;
-
- info = g_file_query_filesystem_info (file,
- G_FILE_ATTRIBUTE_FILESYSTEM_FREE,
- NULL,
- &err);
- if (info != NULL) {
- freespace = g_file_info_get_attribute_uint64 (info,
- G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
- g_object_unref (info);
- }
- else {
- gfile_warning ("Could not get filesystem free space on volume containing the file",
- file,
- err);
- g_error_free (err);
- }
+ guint64 freespace = 0;
+ GFileInfo *info;
+ GError *err = NULL;
+
+ info = g_file_query_filesystem_info (file,
+ G_FILE_ATTRIBUTE_FILESYSTEM_FREE,
+ NULL,
+ &err);
+ if (info != NULL) {
+ freespace = g_file_info_get_attribute_uint64 (info,
+ G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+ g_object_unref (info);
+ } else {
+ gfile_warning ("Could not get filesystem free space on volume containing the file",
+ file,
+ err);
+ g_error_free (err);
+ }
- return freespace;
+ return freespace;
}
GFile *
gfile_get_home_dir (void)
{
- GFile *dir;
-
- dir = gfile_new (g_get_home_dir ());
-
- return dir;
+ GFile *dir;
+
+ dir = gfile_new (g_get_home_dir ());
+
+ return dir;
}
GFile *
gfile_get_tmp_dir (void)
{
- GFile *dir;
-
- dir = gfile_new (g_get_tmp_dir ());
-
- return dir;
+ GFile *dir;
+
+ dir = gfile_new (g_get_tmp_dir ());
+
+ return dir;
}
@@ -520,256 +516,255 @@
static GFile *
_gfile_ith_temp_folder_to_try (int n)
{
- GFile *dir = NULL;
-
- if (n == 1)
- dir = gfile_get_home_dir ();
- else if (n == 2)
- dir = gfile_get_tmp_dir ();
-
- return dir;
+ GFile *dir = NULL;
+
+ if (n == 1)
+ dir = gfile_get_home_dir ();
+ else if (n == 2)
+ dir = gfile_get_tmp_dir ();
+
+ return dir;
}
GFile *
gfile_make_temp_in_dir (GFile *in_dir)
{
- char *path0;
- char *path1;
- char *template;
- GFile *dir;
-
- path0 = g_file_get_path (in_dir);
- template = g_strconcat (path0, "/.gt-XXXXXX", NULL);
- g_free (path0);
-
- path1 = mkdtemp (template);
-
- if (path1 == NULL)
- return NULL;
-
- dir = gfile_new (path1);
-
- g_free (path1);
-
- return dir;
+ char *path0;
+ char *path1;
+ char *template;
+ GFile *dir;
+
+ path0 = g_file_get_path (in_dir);
+ template = g_strconcat (path0, "/.gt-XXXXXX", NULL);
+ g_free (path0);
+
+ path1 = mkdtemp (template);
+
+ if (path1 == NULL)
+ return NULL;
+
+ dir = gfile_new (path1);
+
+ g_free (path1);
+
+ return dir;
}
GFile *
gfile_get_temp_dir_name (void)
{
- int i;
- guint64 max_size = 0;
- GFile *best_folder = NULL;
- GFile *tmp_dir;
-
- /* find the folder with more free space. */
-
- for (i = 1; i <= MAX_TEMP_FOLDER_TO_TRY; i++) {
- GFile *folder;
- guint64 size;
-
- folder = _gfile_ith_temp_folder_to_try (i);
- size = gfile_get_destination_free_space (folder);
- if (max_size < size) {
- max_size = size;
- UNREF (best_folder)
- best_folder = folder;
- }
- else
- g_object_unref (folder);
- }
-
- if (best_folder == NULL)
- return NULL;
-
- if (! gfile_is_local (best_folder)) {
- g_object_unref (best_folder);
- return NULL;
- }
-
- tmp_dir = gfile_make_temp_in_dir (best_folder);
-
- g_object_unref (best_folder);
+ int i;
+ guint64 max_size = 0;
+ GFile *best_folder = NULL;
+ GFile *tmp_dir;
+
+ /* find the folder with more free space. */
+
+ for (i = 1; i <= MAX_TEMP_FOLDER_TO_TRY; i++) {
+ GFile *folder;
+ guint64 size;
+
+ folder = _gfile_ith_temp_folder_to_try (i);
+ size = gfile_get_destination_free_space (folder);
+ if (max_size < size) {
+ max_size = size;
+ UNREF (best_folder)
+ best_folder = folder;
+ } else
+ g_object_unref (folder);
+ }
+
+ if (best_folder == NULL)
+ return NULL;
+
+ if (! gfile_is_local (best_folder)) {
+ g_object_unref (best_folder);
+ return NULL;
+ }
+
+ tmp_dir = gfile_make_temp_in_dir (best_folder);
- return tmp_dir;
+ g_object_unref (best_folder);
+
+ return tmp_dir;
}
static gboolean
_gfile_delete_directory_recursive (GFile *dir,
- GError **error)
+ GError **error)
{
- GFileEnumerator *file_enum;
- GFileInfo *info;
- gboolean error_occurred = FALSE;
-
- if (error != NULL)
- *error = NULL;
-
- file_enum = g_file_enumerate_children (dir,
- G_FILE_ATTRIBUTE_STANDARD_NAME ","
- G_FILE_ATTRIBUTE_STANDARD_TYPE,
- 0, NULL, error);
-
- while (! error_occurred && (info = g_file_enumerator_next_file (file_enum, NULL, error)) != NULL) {
- GFile *child;
-
- child = g_file_get_child (dir, g_file_info_get_name (info));
-
- switch (g_file_info_get_file_type (info)) {
- case G_FILE_TYPE_DIRECTORY:
- if (! _gfile_delete_directory_recursive (child, error))
- error_occurred = TRUE;
- break;
- default:
- if (! g_file_delete (child, NULL, error))
- error_occurred = TRUE;
- break;
- }
-
- g_object_unref (child);
- g_object_unref (info);
- }
+ GFileEnumerator *file_enum;
+ GFileInfo *info;
+ gboolean error_occurred = FALSE;
+
+ if (error != NULL)
+ *error = NULL;
+
+ file_enum = g_file_enumerate_children (dir,
+ G_FILE_ATTRIBUTE_STANDARD_NAME ","
+ G_FILE_ATTRIBUTE_STANDARD_TYPE,
+ 0, NULL, error);
+
+ while (! error_occurred && (info = g_file_enumerator_next_file (file_enum, NULL, error)) != NULL) {
+ GFile *child;
+
+ child = g_file_get_child (dir, g_file_info_get_name (info));
+
+ switch (g_file_info_get_file_type (info)) {
+ case G_FILE_TYPE_DIRECTORY:
+ if (! _gfile_delete_directory_recursive (child, error))
+ error_occurred = TRUE;
+ break;
+ default:
+ if (! g_file_delete (child, NULL, error))
+ error_occurred = TRUE;
+ break;
+ }
+
+ g_object_unref (child);
+ g_object_unref (info);
+ }
- if (! error_occurred && ! g_file_delete (dir, NULL, error))
- error_occurred = TRUE;
+ if (! error_occurred && ! g_file_delete (dir, NULL, error))
+ error_occurred = TRUE;
- g_object_unref (file_enum);
+ g_object_unref (file_enum);
- return ! error_occurred;
+ return ! error_occurred;
}
gboolean
gfile_dir_remove_recursive (GFile *dir)
{
- gboolean result;
- GError *error = NULL;
+ gboolean result;
+ GError *error = NULL;
- result = _gfile_delete_directory_recursive (dir, &error);
- if (! result) {
- gfile_warning ("Cannot delete directory", dir, error);
- g_clear_error (&error);
- }
+ result = _gfile_delete_directory_recursive (dir, &error);
+ if (! result) {
+ gfile_warning ("Cannot delete directory", dir, error);
+ g_clear_error (&error);
+ }
- return result;
+ return result;
}
/* Xfer */
static void _empty_file_progress_cb (goffset current_num_bytes,
- goffset total_num_bytes,
- gpointer user_data)
+ goffset total_num_bytes,
+ gpointer user_data)
{
}
gboolean
gfile_xfer (GFile *sfile,
- GFile *dfile,
- gboolean move)
+ GFile *dfile,
+ gboolean move)
{
- GError *error = NULL;
+ GError *error = NULL;
+
+ if (g_file_equal (sfile, dfile)) {
+ gfile_warning ("cannot copy file: source and destination are the same",
+ sfile,
+ NULL);
+ return FALSE;
+ }
+
+ if (move)
+ g_file_move (sfile, dfile,
+ G_FILE_COPY_OVERWRITE,
+ NULL, _empty_file_progress_cb,
+ NULL, &error);
+ else
+ g_file_copy (sfile, dfile,
+ G_FILE_COPY_OVERWRITE,
+ NULL, _empty_file_progress_cb,
+ NULL, &error);
+
+ if (error != NULL) {
+ gfile_warning ("error during file copy", sfile, error);
+ g_error_free (error);
+ return FALSE;
+ }
- if (g_file_equal (sfile, dfile)) {
- gfile_warning ("cannot copy file: source and destination are the same",
- sfile,
- NULL);
- return FALSE;
- }
-
- if (move)
- g_file_move (sfile, dfile,
- G_FILE_COPY_OVERWRITE,
- NULL, _empty_file_progress_cb,
- NULL, &error);
- else
- g_file_copy (sfile, dfile,
- G_FILE_COPY_OVERWRITE,
- NULL, _empty_file_progress_cb,
- NULL, &error);
-
- if (error != NULL) {
- gfile_warning ("error during file copy", sfile, error);
- g_error_free (error);
- return FALSE;
- }
-
- return TRUE;
+ return TRUE;
}
gboolean
gfile_copy (GFile *sfile,
- GFile *dfile)
+ GFile *dfile)
{
- return gfile_xfer (sfile, dfile, FALSE);
+ return gfile_xfer (sfile, dfile, FALSE);
}
gboolean
gfile_move (GFile *sfile,
- GFile *dfile)
+ GFile *dfile)
{
- return gfile_xfer (sfile, dfile, TRUE);
+ return gfile_xfer (sfile, dfile, TRUE);
}
gssize
-gfile_output_stream_write (GFileOutputStream *ostream,
- GError **error,
- const char *str)
-{
- GError *priv_error = NULL;
- gssize result;
-
-
- g_assert (str != NULL);
-
- if (error == NULL)
- error = &priv_error;
-
- result = g_output_stream_write (G_OUTPUT_STREAM(ostream),
- str,
- strlen (str),
- NULL,
- error);
-
- if (*error != NULL)
- debug (DEBUG_INFO, "could not write string \"%s\": %s\n", str, (*error)->message);
-
- if (priv_error != NULL)
- g_clear_error (&priv_error);
-
- return result;
+gfile_output_stream_write (GFileOutputStream *ostream,
+ GError **error,
+ const char *str)
+{
+ GError *priv_error = NULL;
+ gssize result;
+
+
+ g_assert (str != NULL);
+
+ if (error == NULL)
+ error = &priv_error;
+
+ result = g_output_stream_write (G_OUTPUT_STREAM(ostream),
+ str,
+ strlen (str),
+ NULL,
+ error);
+
+ if (*error != NULL)
+ debug (DEBUG_INFO, "could not write string \"%s\": %s\n", str, (*error)->message);
+
+ if (priv_error != NULL)
+ g_clear_error (&priv_error);
+
+ return result;
}
gssize
-gfile_output_stream_write_line (GFileOutputStream *ostream,
- GError **error,
- const char *format,
- ...)
-{
- va_list args;
- char *str;
- gssize n1 = -1;
- gssize n2 = -1;
-
- g_assert (format != NULL);
-
- va_start (args, format);
- str = g_strdup_vprintf (format, args);
- va_end (args);
-
- n1 = gfile_output_stream_write (ostream, error, str);
-
- if (n1 != -1)
- n2 = gfile_output_stream_write (ostream, error, "\n");
-
- g_free (str);
-
- return (n1 == -1 || n2 == -1 ? -1 : n1 + n2);
+gfile_output_stream_write_line (GFileOutputStream *ostream,
+ GError **error,
+ const char *format,
+ ...)
+{
+ va_list args;
+ char *str;
+ gssize n1 = -1;
+ gssize n2 = -1;
+
+ g_assert (format != NULL);
+
+ va_start (args, format);
+ str = g_strdup_vprintf (format, args);
+ va_end (args);
+
+ n1 = gfile_output_stream_write (ostream, error, str);
+
+ if (n1 != -1)
+ n2 = gfile_output_stream_write (ostream, error, "\n");
+
+ g_free (str);
+
+ return (n1 == -1 || n2 == -1 ? -1 : n1 + n2);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
