luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix redefinition of local variable and non-initialized variable in gio/glocalfileoutputstream.c

Browse Source
This commit is contained in:
Loic Le Page 2022-01-19 19:38:41 +01:00 committed by Loïc Le Page
parent 124733d10c
commit d0dfc76554
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/glocalfileoutputstream.c
View File

@ -855,7 +855,7 @@ handle_overwrite_open (const char *filename,
int open_flags; int open_flags;
int res; int res;
int mode; int mode;
int errsv; int errsv = 0;
gboolean replace_destination_set = (flags & G_FILE_CREATE_REPLACE_DESTINATION); gboolean replace_destination_set = (flags & G_FILE_CREATE_REPLACE_DESTINATION);
mode = mode_from_flags_or_info (flags, reference_info); mode = mode_from_flags_or_info (flags, reference_info);
@ -1179,7 +1179,7 @@ handle_overwrite_open (const char *filename,
/* Seek back to the start of the file after the backup copy */ /* Seek back to the start of the file after the backup copy */
if (lseek (fd, 0, SEEK_SET) == -1) if (lseek (fd, 0, SEEK_SET) == -1)
{ {
int errsv = errno; errsv = errno;
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),
@ -1195,7 +1195,7 @@ handle_overwrite_open (const char *filename,
if (g_unlink (filename) != 0) if (g_unlink (filename) != 0)
{ {
int errsv = errno; errsv = errno;
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),
@ -1211,8 +1211,10 @@ handle_overwrite_open (const char *filename,
fd = g_open (filename, open_flags, mode); fd = g_open (filename, open_flags, mode);
if (fd == -1) if (fd == -1)
{ {
int errsv = errno; char *display_name;
char *display_name = g_filename_display_name (filename); errsv = errno;
display_name = g_filename_display_name (filename);
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),
_("Error opening file “%s”: %s"), _("Error opening file “%s”: %s"),
@ -1230,7 +1232,7 @@ handle_overwrite_open (const char *filename,
if (ftruncate (fd, 0) == -1) if (ftruncate (fd, 0) == -1)
#endif #endif
{ {
int errsv = errno; errsv = errno;
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),