X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flzx-compress.c;h=61c484318179a383b2f5f1af4dc9bc58b10d67cd;hb=db7cd2644605566eefc11c0c992fce670938687c;hp=49aff104f9101da6801776875e47ab68c8b5aec8;hpb=f55116f8cdb1581ec14b91a231292d464194bac3;p=wimlib

diff --git a/src/lzx-compress.c b/src/lzx-compress.c
index 49aff104..61c48431 100644
--- a/src/lzx-compress.c
+++ b/src/lzx-compress.c
@@ -130,9 +130,9 @@ lzx_get_position_slot(unsigned formatted_offset)
 }
 
 static u32
-lzx_record_literal(u8 literal, void *__main_freq_tab)
+lzx_record_literal(u8 literal, void *_main_freq_tab)
 {
-	freq_t *main_freq_tab = __main_freq_tab;
+	freq_t *main_freq_tab = _main_freq_tab;
 	main_freq_tab[literal]++;
 	return literal;
 }
@@ -143,10 +143,10 @@ lzx_record_literal(u8 literal, void *__main_freq_tab)
  * intermediate representation documented below. */
 static u32
 lzx_record_match(unsigned match_offset, unsigned match_len,
-		 void *__freq_tabs, void *__queue)
+		 void *_freq_tabs, void *_queue)
 {
-	struct lzx_freq_tables *freq_tabs = __freq_tabs;
-	struct lru_queue *queue = __queue;
+	struct lzx_freq_tables *freq_tabs = _freq_tabs;
+	struct lru_queue *queue = _queue;
 	unsigned position_slot;
 	unsigned position_footer = 0;
 	u32 match;
@@ -425,7 +425,7 @@ lzx_write_compressed_tree(struct output_bitstream *out,
 	unsigned i;
 	unsigned len_in_run;
 	unsigned additional_bits;
-	char delta;
+	signed char delta;
 	u8 pretree_sym;
 
 	ZERO_ARRAY(pretree_freqs);
@@ -502,7 +502,7 @@ lzx_write_compressed_tree(struct output_bitstream *out,
 			 * */
 			while (cur_run_len >= 4) {
 				additional_bits = (cur_run_len > 4);
-				delta = -(char)len_in_run;
+				delta = -(signed char)len_in_run;
 				if (delta < 0)
 					delta += 17;
 				pretree_freqs[19]++;
@@ -518,7 +518,7 @@ lzx_write_compressed_tree(struct output_bitstream *out,
 		 * as a difference from the length of that codeword in the
 		 * previous tree. */
 		while (cur_run_len--) {
-			delta = -(char)len_in_run;
+			delta = -(signed char)len_in_run;
 			if (delta < 0)
 				delta += 17;
 
@@ -648,7 +648,7 @@ static const struct lz_params lzx_lz_params = {
 
 /* Documented in wimlib.h */
 WIMLIBAPI unsigned
-wimlib_lzx_compress(const void *__uncompressed_data, unsigned uncompressed_len,
+wimlib_lzx_compress(const void *_uncompressed_data, unsigned uncompressed_len,
 		    void *compressed_data)
 {
 	struct output_bitstream ostream;
@@ -675,7 +675,7 @@ wimlib_lzx_compress(const void *__uncompressed_data, unsigned uncompressed_len,
 
 	/* The input data must be preprocessed. To avoid changing the original
 	 * input, copy it to a temporary buffer. */
-	memcpy(uncompressed_data, __uncompressed_data, uncompressed_len);
+	memcpy(uncompressed_data, _uncompressed_data, uncompressed_len);
 	memset(uncompressed_data + uncompressed_len, 0, 8);
 
 	/* Before doing any actual compression, do the call instruction (0xe8
@@ -764,7 +764,7 @@ wimlib_lzx_compress(const void *__uncompressed_data, unsigned uncompressed_len,
 		}
 
 		for (i = 0; i < uncompressed_len; i++) {
-			if (buf[i] != *((u8*)__uncompressed_data + i)) {
+			if (buf[i] != *((u8*)_uncompressed_data + i)) {
 				ERROR("lzx_compress(): Data we compressed didn't "
 				      "decompress to the original data (difference at "
 				      "byte %u of %u)", i + 1, uncompressed_len);