Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b43828b2 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 317a09e2

libsparse/output_file.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

libsparse/output_file.h

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 


struct output_file;



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);

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);

int write_data_chunk(struct output_file *out, unsigned int len, void *data);
@@ -34,7 +34,7 @@ int write_file_chunk(struct output_file *out, unsigned int len, 
int write_fd_chunk(struct output_file *out, unsigned int len,

		int fd, int64_t offset);

int write_skip_chunk(struct output_file *out, int64_t len);

void close_output_file(struct output_file *out);

void output_file_close(struct output_file *out);



int read_all(int fd, void *buf, size_t len);

libsparse/sparse.c

+8 −8
Original line number Diff line number Diff line
@@ -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;

}