diff options
author | Colin Cross <ccross@android.com> | 2012-06-08 16:55:35 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-07-09 22:09:37 -0700 |
commit | b43828b247fd4f1e0373584de0504004c69eeac9 (patch) | |
tree | 57141bc0f9b57cb3c7da4106e9276452da30ef90 /libsparse/output_file.c | |
parent | 317a09e2d47257df5e0972c85f14c2a6ffdbbfd2 (diff) | |
download | system_core-b43828b247fd4f1e0373584de0504004c69eeac9.tar.gz system_core-b43828b247fd4f1e0373584de0504004c69eeac9.tar.bz2 system_core-b43828b247fd4f1e0373584de0504004c69eeac9.zip |
libsparse: rename symbols that conflict with libext4_utils
Until ext4_utils switches to using libsparse, libext4_utils defines some
of the same symbols as libsparse. Fastboot links statically against
both of them, and there is no easy way to make the symbols hidden, so
just rename them in libsparse.
Change-Id: Idc2cfe20efe3c3a7fb8233f453a89bbbeb0dcc8b
Diffstat (limited to 'libsparse/output_file.c')
-rw-r--r-- | libsparse/output_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsparse/output_file.c b/libsparse/output_file.c index dc56149e7..b5ae4191f 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c @@ -541,7 +541,7 @@ static struct sparse_file_ops normal_file_ops = { .write_end_chunk = write_normal_end_chunk, }; -void close_output_file(struct output_file *out) +void output_file_close(struct output_file *out) { int ret; @@ -638,7 +638,7 @@ static struct output_file *output_file_new_normal(void) return &outn->out; } -struct output_file *open_output_callback(int (*write)(void *, const void *, int), +struct output_file *output_file_open_callback(int (*write)(void *, const void *, int), void *priv, unsigned int block_size, int64_t len, int gz, int sparse, int chunks, int crc) { @@ -664,7 +664,7 @@ struct output_file *open_output_callback(int (*write)(void *, const void *, int) return &outc->out; } -struct output_file *open_output_fd(int fd, unsigned int block_size, int64_t len, +struct output_file *output_file_open_fd(int fd, unsigned int block_size, int64_t len, int gz, int sparse, int chunks, int crc) { int ret; |