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

Fix global variable name hidden by local variables in gio/gio-tool-save.c

Browse Source
This commit is contained in:
Loic Le Page 2022-01-19 17:27:34 +01:00 committed by Philip Withnall
parent 781231d556
commit c0dabdd8df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gio-tool-save.c
View File

@ -36,7 +36,7 @@
#include "gio-tool.h" #include "gio-tool.h"
static char *etag = NULL; static char *global_etag = NULL;
static gboolean backup = FALSE; static gboolean backup = FALSE;
static gboolean create = FALSE; static gboolean create = FALSE;
static gboolean append = FALSE; static gboolean append = FALSE;
@ -54,7 +54,7 @@ static const GOptionEntry entries[] =
/* Translators: The "etag" is a token allowing to verify whether a file has been modified */ /* Translators: The "etag" is a token allowing to verify whether a file has been modified */
{ "print-etag", 'v', 0, G_OPTION_ARG_NONE, &print_etag, N_("Print new etag at end"), NULL }, { "print-etag", 'v', 0, G_OPTION_ARG_NONE, &print_etag, N_("Print new etag at end"), NULL },
/* Translators: The "etag" is a token allowing to verify whether a file has been modified */ /* Translators: The "etag" is a token allowing to verify whether a file has been modified */
{ "etag", 'e', 0, G_OPTION_ARG_STRING, &etag, N_("The etag of the file being overwritten"), N_("ETAG") }, { "etag", 'e', 0, G_OPTION_ARG_STRING, &global_etag, N_("The etag of the file being overwritten"), N_("ETAG") },
G_OPTION_ENTRY_NULL G_OPTION_ENTRY_NULL
}; };
@ -82,7 +82,7 @@ save (GFile *file)
else if (append) else if (append)
out = (GOutputStream *)g_file_append_to (file, flags, NULL, &error); out = (GOutputStream *)g_file_append_to (file, flags, NULL, &error);
else else
out = (GOutputStream *)g_file_replace (file, etag, backup, flags, NULL, &error); out = (GOutputStream *)g_file_replace (file, global_etag, backup, flags, NULL, &error);
if (out == NULL) if (out == NULL)
{ {
print_file_error (file, error->message); print_file_error (file, error->message);