luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

avoid unnecessary filename conversions.

Browse Source 
2005-03-09  Sven Neumann  <sven@gimp.org>

	* glib/gfileutils.c (g_file_replace): avoid unnecessary filename
	conversions.
This commit is contained in:
Sven Neumann 2005-03-09 11:22:09 +00:00 committed by Sven Neumann
parent 1607e3f1d0
commit cd8a0ac41f
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-03-09 Sven Neumann <sven@gimp.org>
* glib/gfileutils.c (g_file_replace): avoid unnecessary filename
conversions.
2005-03-09 Tor Lillqvist <tml@novell.com> 2005-03-09 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir, * glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir,

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-03-09 Sven Neumann <sven@gimp.org>
* glib/gfileutils.c (g_file_replace): avoid unnecessary filename
conversions.
2005-03-09 Tor Lillqvist <tml@novell.com> 2005-03-09 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir, * glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir,

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
2005-03-09 Sven Neumann <sven@gimp.org>
* glib/gfileutils.c (g_file_replace): avoid unnecessary filename
conversions.
2005-03-09 Tor Lillqvist <tml@novell.com> 2005-03-09 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir, * glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir,

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2005-03-09 Sven Neumann <sven@gimp.org>
* glib/gfileutils.c (g_file_replace): avoid unnecessary filename
conversions.
2005-03-09 Tor Lillqvist <tml@novell.com> 2005-03-09 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir, * glib/gutils.c (g_get_user_data_dir, g_get_user_config_dir,

14
glib/gfileutils.c
View File

@ -984,9 +984,7 @@ g_file_replace (const gchar *filename,
gssize length, gssize length,
GError **error) GError **error)
{ {
char *tmp_filename = NULL; gchar *tmp_filename;
char *display_filename = NULL;
char *display_tmpname = NULL;
gboolean retval; gboolean retval;
GError *rename_error = NULL; GError *rename_error = NULL;
@ -1005,9 +1003,6 @@ g_file_replace (const gchar *filename,
goto out; goto out;
} }
display_tmpname = g_filename_display_name (tmp_filename);
display_filename = g_filename_display_name (filename);
if (!rename_file (tmp_filename, filename, &rename_error)) if (!rename_file (tmp_filename, filename, &rename_error))
{ {
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
@ -1035,13 +1030,16 @@ g_file_replace (const gchar *filename,
if (g_unlink (filename) == -1) if (g_unlink (filename) == -1)
{ {
gchar *display_filename = g_filename_display_name (filename);
g_set_error (error, g_set_error (error,
G_FILE_ERROR, G_FILE_ERROR,
g_file_error_from_errno (errno), g_file_error_from_errno (errno),
_("Existing file '%s' could not be removed: g_unlink() failed: %s"), _("Existing file '%s' could not be removed: g_unlink() failed: %s"),
display_filename, display_filename,
g_strerror (errno)); g_strerror (errno));
g_free (display_filename);
g_unlink (tmp_filename); g_unlink (tmp_filename);
retval = FALSE; retval = FALSE;
goto out; goto out;
@ -1060,8 +1058,6 @@ g_file_replace (const gchar *filename,
retval = TRUE; retval = TRUE;
out: out:
g_free (display_tmpname);
g_free (display_filename);
g_free (tmp_filename); g_free (tmp_filename);
return retval; return retval;
} }