diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-07-26 03:13:45 +0000 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2018-07-26 05:23:45 +0000 |
| commit | fca4a9c27950a4a4281de0f413280cff9f4da653 (patch) | |
| tree | 6383a387c5b9cb0fbfa49be34abb27d30d2d82fa /libsparse/include | |
| parent | db69f0d47f3ccb3ff656c56fe2b68aaf5ab853f6 (diff) | |
| download | system_core-fca4a9c27950a4a4281de0f413280cff9f4da653.tar.gz system_core-fca4a9c27950a4a4281de0f413280cff9f4da653.tar.bz2 system_core-fca4a9c27950a4a4281de0f413280cff9f4da653.zip | |
Revert "libsparse: Add sparse typed callback"
This reverts commit db69f0d47f3ccb3ff656c56fe2b68aaf5ab853f6.
Reason for revert: Broke the build:
In file included from system/core/libsparse/sparse.cpp:26:
system/core/libsparse/output_file.h:34:72: error: unknown type name 'off64_t'; did you mean 'off_t'?
int (*skip_write)(void*, off64_t), void* priv,
^~~~~~~
off_t
/Applications/Xcode6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/_types/_off_t.h:30:25: note: 'off_t' declared here
typedef __darwin_off_t off_t;
^
1 error generated.
Bug: 78793464
Change-Id: I0f8bc4e9aa2f74612bfd8721d00d961e3f7e695f
Diffstat (limited to 'libsparse/include')
| -rw-r--r-- | libsparse/include/sparse/sparse.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/libsparse/include/sparse/sparse.h b/libsparse/include/sparse/sparse.h index 586578633..3d5fb0c53 100644 --- a/libsparse/include/sparse/sparse.h +++ b/libsparse/include/sparse/sparse.h @@ -210,37 +210,6 @@ int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc, int (*write)(void *priv, const void *data, size_t len), void *priv); /** - * sparse_file_callback_typed - call a callback for blocks based on type - * - * @s - sparse file cookie - * @sparse - write in the Android sparse file format - * @data_write - function to call for data blocks. must not be null - * @fd_write - function to call for fd blocks - * @fill_write - function to call for fill blocks - * @skip_write - function to call for skip blocks - * @priv - value that will be passed as the first argument to each write - * - * Writes a sparse file by calling callback functions. If sparse is true, the - * file will be written in the Android sparse file format, and fill and skip blocks - * along with metadata will be written with data_write. If sparse is false, the file - * will be expanded into normal format and fill and skip blocks will be written with - * the given callbacks. - * If a callback function is provided, the library will not unroll data into a buffer, - * and will instead pass it directly to the caller for custom implementation. If a - * callback is not provided, that type of block will be converted into a void* and - * written with data_write. If no callbacks other than data are provided, the behavior - * is the same as sparse_file_callback(). The callback should return negative on error, - * 0 on success. - * - * Returns 0 on success, negative errno on error. - */ -int sparse_file_callback_typed(struct sparse_file* s, bool sparse, - int (*data_write)(void* priv, const void* data, size_t len), - int (*fd_write)(void* priv, int fd, size_t len), - int (*fill_write)(void* priv, uint32_t fill_val, size_t len), - int (*skip_write)(void* priv, int64_t len), void* priv); - -/** * sparse_file_foreach_chunk - call a callback for data blocks in sparse file * * @s - sparse file cookie |
