summaryrefslogtreecommitdiffstats
path: root/core/io/file_access_zip.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-02-20 22:24:58 +0100
committerGitHub <noreply@github.com>2019-02-20 22:24:58 +0100
commit8107fc98b6ceae749b3c10e6f0432e904961867b (patch)
tree6c0ab829b02aba47ff3dc27b9a14d3c3a0658a3b /core/io/file_access_zip.cpp
parent132e2f458df7a3551a251d68afeccd0362ca6be2 (diff)
parent8d51618949d5ea8a94e0f504401e8f852a393968 (diff)
downloadredot-engine-8107fc98b6ceae749b3c10e6f0432e904961867b.tar.gz
Merge pull request #25853 from marxin/fix-25316-wshadow-local
Add -Wshadow=local to warnings and fix reported issues (#25316).
Diffstat (limited to 'core/io/file_access_zip.cpp')
-rw-r--r--core/io/file_access_zip.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/io/file_access_zip.cpp b/core/io/file_access_zip.cpp
index 66b911e83c..be28c9a877 100644
--- a/core/io/file_access_zip.cpp
+++ b/core/io/file_access_zip.cpp
@@ -168,10 +168,10 @@ bool ZipArchive::try_open_pack(const String &p_path) {
zlib_filefunc_def io;
- FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
- if (!f)
+ FileAccess *fa = FileAccess::open(p_path, FileAccess::READ);
+ if (!fa)
return false;
- io.opaque = f;
+ io.opaque = fa;
io.zopen_file = godot_open;
io.zread_file = godot_read;
io.zwrite_file = godot_write;