Introduce ilog2_ceil()

[wimlib] / src / lzx_common.c

diff --git a/src/lzx_common.c b/src/lzx_common.c
index 0677e0a0d40693a37888c431b521771621ad60e1..7925f1f197b6803ce31bca7fed7564302f6220e1 100644 (file)
--- 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
  *
  * 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
 lzx_get_window_order(size_t max_bufsize)
 {

-       unsigned order;
-

        if (max_bufsize == 0 || max_bufsize > LZX_MAX_WINDOW_SIZE)
                return 0;
 
        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
 }
 
 /* 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;
 
 {
        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" */
        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;
                }
                        /* "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;
 
 {
        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;
        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;
                }
        } 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);

                }
        }
 }
                }
        }
 }