X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flzx_common.c;h=7925f1f197b6803ce31bca7fed7564302f6220e1;hp=6eab2031f24930187bbf3ef8b70fe76525be9d5c;hb=144bba695a7a57cdd179dcfd1a916264c8bd4cde;hpb=bc2c937b20d2eb3bff2ee3f8c8269a2ea37bdca4

diff --git a/src/lzx_common.c b/src/lzx_common.c
index 6eab2031..7925f1f1 100644
--- a/src/lzx_common.c
+++ b/src/lzx_common.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers
+ * Copyright (C) 2012-2016 Eric Biggers
  *
  * This file is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -76,17 +76,10 @@ const u8 lzx_extra_offset_bits[LZX_MAX_OFFSET_SLOTS] = {
 unsigned
 lzx_get_window_order(size_t max_bufsize)
 {
-	unsigned order;
-
 	if (max_bufsize == 0 || max_bufsize > LZX_MAX_WINDOW_SIZE)
 		return 0;
 
-	order = fls32(max_bufsize);
-
-	if (((u32)1 << order) != max_bufsize)
-		order++;
-
-	return max(order, LZX_MIN_WINDOW_ORDER);
+	return max(ilog2_ceil(max_bufsize), LZX_MIN_WINDOW_ORDER);
 }
 
 /* Given a valid LZX window order, return the number of symbols that will exist
@@ -114,7 +107,7 @@ do_translate_target(void *target, s32 input_pos)
 {
 	s32 abs_offset, rel_offset;
 
-	rel_offset = get_unaligned_u32_le(target);
+	rel_offset = get_unaligned_le32(target);
 	if (rel_offset >= -input_pos && rel_offset < LZX_WIM_MAGIC_FILESIZE) {
 		if (rel_offset < LZX_WIM_MAGIC_FILESIZE - input_pos) {
 			/* "good translation" */
@@ -123,7 +116,7 @@ do_translate_target(void *target, s32 input_pos)
 			/* "compensating translation" */
 			abs_offset = rel_offset - LZX_WIM_MAGIC_FILESIZE;
 		}
-		put_unaligned_u32_le(abs_offset, target);
+		put_unaligned_le32(abs_offset, target);
 	}
 }
 
@@ -132,18 +125,18 @@ undo_translate_target(void *target, s32 input_pos)
 {
 	s32 abs_offset, rel_offset;
 
-	abs_offset = get_unaligned_u32_le(target);
+	abs_offset = get_unaligned_le32(target);
 	if (abs_offset >= 0) {
 		if (abs_offset < LZX_WIM_MAGIC_FILESIZE) {
 			/* "good translation" */
 			rel_offset = abs_offset - input_pos;
-			put_unaligned_u32_le(rel_offset, target);
+			put_unaligned_le32(rel_offset, target);
 		}
 	} else {
 		if (abs_offset >= -input_pos) {
 			/* "compensating translation" */
 			rel_offset = abs_offset + LZX_WIM_MAGIC_FILESIZE;
-			put_unaligned_u32_le(rel_offset, target);
+			put_unaligned_le32(rel_offset, target);
 		}
 	}
 }
@@ -323,13 +316,13 @@ lzx_e8_filter(u8 *data, u32 size, void (*process_target)(void *, s32))
 }
 
 void
-lzx_do_e8_preprocessing(u8 *data, u32 size)
+lzx_preprocess(u8 *data, u32 size)
 {
 	lzx_e8_filter(data, size, do_translate_target);
 }
 
 void
-lzx_undo_e8_preprocessing(u8 *data, u32 size)
+lzx_postprocess(u8 *data, u32 size)
 {
 	lzx_e8_filter(data, size, undo_translate_target);
 }