commit fca4a9c27950a4a4281de0f413280cff9f4da653
author Tobias Thierer <tobiast@google.com> Thu Jul 26 03:13:45 2018 +0000
committer Tao Bao <tbao@google.com> Thu Jul 26 05:23:45 2018 +0000
tree 6383a387c5b9cb0fbfa49be34abb27d30d2d82fa
parent db69f0d47f3ccb3ff656c56fe2b68aaf5ab853f6

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

libsparse/sparse.cpp

diff --git a/libsparse/sparse.cpp b/libsparse/sparse.cpp
index f5ca907..cb288c5 100644
--- a/libsparse/sparse.cpp
+++ b/libsparse/sparse.cpp
@@ -160,30 +160,7 @@
   struct output_file* out;
 
   chunks = sparse_count_chunks(s);
-  out = output_file_open_callback(write, nullptr, nullptr, nullptr, priv, s->block_size, s->len,
-                                  sparse, chunks, crc);
-
-  if (!out) return -ENOMEM;
-
-  ret = write_all_blocks(s, out);
-
-  output_file_close(out);
-
-  return ret;
-}
-
-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) {
-  int ret;
-  int chunks;
-  struct output_file* out;
-
-  chunks = sparse_count_chunks(s);
-  out = output_file_open_callback(data_write, fd_write, fill_write, skip_write, priv, s->block_size,
-                                  s->len, sparse, chunks, false);
+  out = output_file_open_callback(write, priv, s->block_size, s->len, false, sparse, chunks, crc);
 
   if (!out) return -ENOMEM;
 
@@ -221,8 +198,8 @@
   chk.write = write;
   chk.block = chk.nr_blocks = 0;
   chunks = sparse_count_chunks(s);
-  out = output_file_open_callback(foreach_chunk_write, nullptr, nullptr, nullptr, &chk,
-                                  s->block_size, s->len, sparse, chunks, crc);
+  out = output_file_open_callback(foreach_chunk_write, &chk, s->block_size, s->len, false, sparse,
+                                  chunks, crc);
 
   if (!out) return -ENOMEM;
 
@@ -250,8 +227,8 @@
   int64_t count = 0;
   struct output_file* out;
 
-  out = output_file_open_callback(out_counter_write, nullptr, nullptr, nullptr, &count,
-                                  s->block_size, s->len, sparse, chunks, crc);
+  out = output_file_open_callback(out_counter_write, &count, s->block_size, s->len, false, sparse,
+                                  chunks, crc);
   if (!out) {
     return -1;
   }
@@ -290,8 +267,8 @@
   len -= overhead;
 
   start = backed_block_iter_new(from->backed_block_list);
-  out_counter = output_file_open_callback(out_counter_write, nullptr, nullptr, nullptr, &count,
-                                          to->block_size, to->len, true, 0, false);
+  out_counter = output_file_open_callback(out_counter_write, &count, to->block_size, to->len, false,
+                                          true, 0, false);
   if (!out_counter) {
     return nullptr;
   }