openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libsparse: Use 'size_t' for the 'len' parameter in callbacks. am: e18c03165b 

am: 315efbeb9a

Change-Id: I2cf89d54f1c266a5cfd6107e49378cb3d344ef4b
This commit is contained in:
Tao Bao 2018-04-30 16:18:26 -07:00 committed by android-build-merger
parent da6a06548a 315efbeb9a
commit 4f46ef48cf
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsparse/include/sparse/sparse.h
View File

@ -18,6 +18,7 @@
#define _LIBSPARSE_SPARSE_H_
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#ifdef __cplusplus
@ -26,6 +27,11 @@ extern "C" {
struct sparse_file;
// The callbacks in sparse_file_callback() and sparse_file_foreach_chunk() take
// size_t as the length type (was `int` in past). This allows clients to keep
// their codes compatibile with both versions as needed.
#define SPARSE_CALLBACK_USES_SIZE_T
/**
* sparse_file_new - create a new sparse file cookie
*
@ -201,7 +207,7 @@ unsigned int sparse_file_block_size(struct sparse_file *s);
* Returns 0 on success, negative errno on error.
*/
int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc,
int (*write)(void *priv, const void *data, int len), void *priv);
int (*write)(void *priv, const void *data, size_t len), void *priv);
/**
* sparse_file_foreach_chunk - call a callback for data blocks in sparse file
@ -218,7 +224,7 @@ int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc,
* Returns 0 on success, negative errno on error.
*/
int sparse_file_foreach_chunk(struct sparse_file *s, bool sparse, bool crc,
int (*write)(void *priv, const void *data, int len, unsigned int block,
int (*write)(void *priv, const void *data, size_t len, unsigned int block,
unsigned int nr_blocks),
void *priv);
/**

5
libsparse/output_file.c
View File

@ -109,7 +109,7 @@ struct output_file_normal {
struct output_file_callback {
struct output_file out;
void *priv;
int (*write)(void *priv, const void *buf, int len);
int (*write)(void *priv, const void *buf, size_t len);
};
#define to_output_file_callback(_o) \
@ -634,7 +634,8 @@ static struct output_file *output_file_new_normal(void)
return &outn->out;
}
struct output_file *output_file_open_callback(int (*write)(void *, const void *, int),
struct output_file *output_file_open_callback(
int (*write)(void *, const void *, size_t),
void *priv, unsigned int block_size, int64_t len,
int gz __unused, int sparse, int chunks, int crc)
{

3
libsparse/output_file.h
View File

@ -27,7 +27,8 @@ struct output_file;
struct output_file *output_file_open_fd(int fd, unsigned int block_size, int64_t len,
int gz, int sparse, int chunks, int crc);
struct output_file *output_file_open_callback(int (*write)(void *, const void *, int),
struct output_file *output_file_open_callback(
int (*write)(void *, const void *, size_t),
void *priv, unsigned int block_size, int64_t len, int gz, int sparse,
int chunks, int crc);
int write_data_chunk(struct output_file *out, unsigned int len, void *data);

12
libsparse/sparse.c
View File

@ -179,7 +179,7 @@ int sparse_file_write(struct sparse_file *s, int fd, bool gz, bool sparse,
}
int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc,
int (*write)(void *priv, const void *data, int len), void *priv)
int (*write)(void *priv, const void *data, size_t len), void *priv)
{
int ret;
int chunks;
@ -203,11 +203,11 @@ struct chunk_data {
void *priv;
unsigned int block;
unsigned int nr_blocks;
int (*write)(void *priv, const void *data, int len, unsigned int block,
unsigned int nr_blocks);
int (*write)(void *priv, const void *data, size_t len,
unsigned int block, unsigned int nr_blocks);
};
static int foreach_chunk_write(void *priv, const void *data, int len)
static int foreach_chunk_write(void *priv, const void *data, size_t len)
{
struct chunk_data *chk = priv;
@ -215,7 +215,7 @@ static int foreach_chunk_write(void *priv, const void *data, int len)
}
int sparse_file_foreach_chunk(struct sparse_file *s, bool sparse, bool crc,
int (*write)(void *priv, const void *data, int len, unsigned int block,
int (*write)(void *priv, const void *data, size_t len, unsigned int block,
unsigned int nr_blocks),
void *priv)
{
@ -250,7 +250,7 @@ int sparse_file_foreach_chunk(struct sparse_file *s, bool sparse, bool crc,
return ret;
}
static int out_counter_write(void *priv, const void *data __unused, int len)
static int out_counter_write(void *priv, const void *data __unused, size_t len)
{
int64_t *count = priv;
*count += len;