Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Zlib
提交
37281ac2
T
Third Party Zlib
项目概览
OpenHarmony
/
Third Party Zlib
接近 2 年 前同步成功
通知
18
Star
112
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Zlib
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
37281ac2
编写于
11月 15, 2016
作者:
M
Mark Adler
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add uncompress2() function, which returns the input size used.
上级
001300d0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
18 deletion
+39
-18
uncompr.c
uncompr.c
+30
-17
zlib.h
zlib.h
+9
-1
未找到文件。
uncompr.c
浏览文件 @
37281ac2
/* uncompr.c -- decompress a memory buffer
* Copyright (C) 1995-2003, 2010, 2014 Jean-loup Gailly, Mark Adler
* Copyright (C) 1995-2003, 2010, 2014
, 2016
Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
...
...
@@ -9,31 +9,34 @@
#include "zlib.h"
/* ===========================================================================
Decompresses the source buffer into the destination buffer. sourceLen is
the byte length of the source buffer. Upon entry, destLen is the total
size of the destination buffer, which must be large enough to hold the
entire uncompressed data. (The size of the uncompressed data must have
been saved previously by the compressor and transmitted to the decompressor
by some mechanism outside the scope of this compression library.)
Upon exit, destLen is the actual size of the compressed buffer.
Decompresses the source buffer into the destination buffer. *sourceLen is
the byte length of the source buffer. Upon entry, *destLen is the total size
of the destination buffer, which must be large enough to hold the entire
uncompressed data. (The size of the uncompressed data must have been saved
previously by the compressor and transmitted to the decompressor by some
mechanism outside the scope of this compression library.) Upon exit,
*destLen is the size of the decompressed data and *sourceLen is the number
of source bytes consumed. Upon return, source + *sourceLen points to the
first unused input byte.
uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
enough memory, Z_BUF_ERROR if there was not enough room in the output
buffer, or Z_DATA_ERROR if the input data was corrupted, including if the
input data is
an incomplete zlib stream.
uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
enough
memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
Z_DATA_ERROR if the input data was corrupted, including if the input data is
an incomplete zlib stream.
*/
int
ZEXPORT
uncompress
(
dest
,
destLen
,
source
,
sourceLen
)
int
ZEXPORT
uncompress
2
(
dest
,
destLen
,
source
,
sourceLen
)
Bytef
*
dest
;
uLongf
*
destLen
;
const
Bytef
*
source
;
uLong
sourceLen
;
uLong
*
sourceLen
;
{
z_stream
stream
;
int
err
;
const
uInt
max
=
(
uInt
)
0
-
1
;
uLong
left
;
uLong
le
n
,
le
ft
;
Byte
buf
[
1
];
/* for detection of incomplete stream when *destLen == 0 */
len
=
*
sourceLen
;
if
(
*
destLen
)
{
left
=
*
destLen
;
*
destLen
=
0
;
...
...
@@ -61,12 +64,13 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
left
-=
stream
.
avail_out
;
}
if
(
stream
.
avail_in
==
0
)
{
stream
.
avail_in
=
sourceLen
>
(
uLong
)
max
?
max
:
(
uInt
)
sourceL
en
;
sourceL
en
-=
stream
.
avail_in
;
stream
.
avail_in
=
len
>
(
uLong
)
max
?
max
:
(
uInt
)
l
en
;
l
en
-=
stream
.
avail_in
;
}
err
=
inflate
(
&
stream
,
Z_NO_FLUSH
);
}
while
(
err
==
Z_OK
);
*
sourceLen
-=
len
+
stream
.
avail_in
;
if
(
dest
!=
buf
)
*
destLen
=
stream
.
total_out
;
else
if
(
stream
.
total_out
&&
err
==
Z_BUF_ERROR
)
...
...
@@ -78,3 +82,12 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
err
==
Z_BUF_ERROR
&&
left
+
stream
.
avail_out
?
Z_DATA_ERROR
:
err
;
}
int
ZEXPORT
uncompress
(
dest
,
destLen
,
source
,
sourceLen
)
Bytef
*
dest
;
uLongf
*
destLen
;
const
Bytef
*
source
;
uLong
sourceLen
;
{
return
uncompress2
(
dest
,
destLen
,
source
,
&
sourceLen
);
}
zlib.h
浏览文件 @
37281ac2
...
...
@@ -1246,7 +1246,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
uncompressed data. (The size of the uncompressed data must have been saved
previously by the compressor and transmitted to the decompressor by some
mechanism outside the scope of this compression library.) Upon exit, destLen
is the actual size of the uncompressed
buffer
.
is the actual size of the uncompressed
data
.
uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
enough memory, Z_BUF_ERROR if there was not enough room in the output
...
...
@@ -1255,6 +1255,14 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
buffer with the uncompressed data up to that point.
*/
ZEXTERN
int
ZEXPORT
uncompress2
OF
((
Bytef
*
dest
,
uLongf
*
destLen
,
const
Bytef
*
source
,
uLong
*
sourceLen
));
/*
Same as uncompress, except that sourceLen is a pointer, where the
length of the source is *sourceLen. On return, *sourceLen is the number of
source bytes consumed.
*/
/* gzip file access functions */
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录