Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
014334cc
Unverified
Commit
014334cc
authored
7 years ago
by
davidcunado-arm
Committed by
GitHub
7 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1260 from sandrine-bailleux-arm/topics/sb/fix-zlib-build
zlib: Fix build error when LOG_LEVEL=50
parents
cc40f7fe
57546074
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/zlib/tf_gunzip.c
+2
-2
lib/zlib/tf_gunzip.c
with
2 additions
and
2 deletions
+2
-2
lib/zlib/tf_gunzip.c
View file @
014334cc
...
...
@@ -89,8 +89,8 @@ int gunzip(uintptr_t *in_buf, size_t in_len, uintptr_t *out_buf,
ret
=
(
zret
==
Z_MEM_ERROR
)
?
-
ENOMEM
:
-
EIO
;
}
VERBOSE
(
"zlib: %
d
byte input
\n
"
,
stream
.
total_in
);
VERBOSE
(
"zlib: %
d
byte output
\n
"
,
stream
.
total_out
);
VERBOSE
(
"zlib: %
lu
byte input
\n
"
,
stream
.
total_in
);
VERBOSE
(
"zlib: %
lu
byte output
\n
"
,
stream
.
total_out
);
*
in_buf
=
(
uintptr_t
)
stream
.
next_in
;
*
out_buf
=
(
uintptr_t
)
stream
.
next_out
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help