From b43828b247fd4f1e0373584de0504004c69eeac9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 8 Jun 2012 16:55:35 -0700 Subject: 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 --- libsparse/sparse.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libsparse/sparse.c') diff --git a/libsparse/sparse.c b/libsparse/sparse.c index f04f687b..189b4c03 100644 --- a/libsparse/sparse.c +++ b/libsparse/sparse.c @@ -156,14 +156,14 @@ int sparse_file_write(struct sparse_file *s, int fd, bool gz, bool sparse, struct output_file *out; chunks = sparse_count_chunks(s); - out = open_output_fd(fd, s->block_size, s->len, gz, sparse, chunks, crc); + out = output_file_open_fd(fd, s->block_size, s->len, gz, sparse, chunks, crc); if (!out) return -ENOMEM; ret = write_all_blocks(s, out); - close_output_file(out); + output_file_close(out); return ret; } @@ -176,7 +176,7 @@ int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc, struct output_file *out; chunks = sparse_count_chunks(s); - out = open_output_callback(write, priv, s->block_size, s->len, false, + out = output_file_open_callback(write, priv, s->block_size, s->len, false, sparse, chunks, crc); if (!out) @@ -184,7 +184,7 @@ int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc, ret = write_all_blocks(s, out); - close_output_file(out); + output_file_close(out); return ret; } @@ -203,7 +203,7 @@ int64_t sparse_file_len(struct sparse_file *s, bool sparse, bool crc) int64_t count = 0; struct output_file *out; - out = open_output_callback(out_counter_write, &count, + out = output_file_open_callback(out_counter_write, &count, s->block_size, s->len, false, sparse, chunks, crc); if (!out) { return -1; @@ -211,7 +211,7 @@ int64_t sparse_file_len(struct sparse_file *s, bool sparse, bool crc) ret = write_all_blocks(s, out); - close_output_file(out); + output_file_close(out); if (ret < 0) { return -1; @@ -239,7 +239,7 @@ static struct backed_block *move_chunks_up_to_len(struct sparse_file *from, len -= overhead; start = backed_block_iter_new(from->backed_block_list); - out_counter = open_output_callback(out_counter_write, &count, + out_counter = output_file_open_callback(out_counter_write, &count, to->block_size, to->len, false, true, 0, false); if (!out_counter) { return NULL; @@ -269,7 +269,7 @@ out: backed_block_list_move(from->backed_block_list, to->backed_block_list, start, last_bb); - close_output_file(out_counter); + output_file_close(out_counter); return bb; } -- cgit v1.2.3