diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libsparse/include/sparse/sparse.h | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libsparse/include/sparse/sparse.h')
| -rw-r--r-- | libsparse/include/sparse/sparse.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libsparse/include/sparse/sparse.h b/libsparse/include/sparse/sparse.h index 3d5fb0c53..2f75349a6 100644 --- a/libsparse/include/sparse/sparse.h +++ b/libsparse/include/sparse/sparse.h @@ -75,8 +75,7 @@ void sparse_file_destroy(struct sparse_file *s); * * Returns 0 on success, negative errno on error. */ -int sparse_file_add_data(struct sparse_file *s, - void *data, unsigned int len, unsigned int block); +int sparse_file_add_data(struct sparse_file* s, void* data, uint64_t len, unsigned int block); /** * sparse_file_add_fill - associate a fill chunk with a sparse file @@ -93,8 +92,8 @@ int sparse_file_add_data(struct sparse_file *s, * * Returns 0 on success, negative errno on error. */ -int sparse_file_add_fill(struct sparse_file *s, - uint32_t fill_val, unsigned int len, unsigned int block); +int sparse_file_add_fill(struct sparse_file* s, uint32_t fill_val, uint64_t len, + unsigned int block); /** * sparse_file_add_file - associate a chunk of a file with a sparse file @@ -116,9 +115,8 @@ int sparse_file_add_fill(struct sparse_file *s, * * Returns 0 on success, negative errno on error. */ -int sparse_file_add_file(struct sparse_file *s, - const char *filename, int64_t file_offset, unsigned int len, - unsigned int block); +int sparse_file_add_file(struct sparse_file* s, const char* filename, int64_t file_offset, + uint64_t len, unsigned int block); /** * sparse_file_add_file - associate a chunk of a file with a sparse file @@ -143,8 +141,8 @@ int sparse_file_add_file(struct sparse_file *s, * * Returns 0 on success, negative errno on error. */ -int sparse_file_add_fd(struct sparse_file *s, - int fd, int64_t file_offset, unsigned int len, unsigned int block); +int sparse_file_add_fd(struct sparse_file* s, int fd, int64_t file_offset, uint64_t len, + unsigned int block); /** * sparse_file_write - write a sparse file to a file |