Use LGPLv3+ for src/*.c

[wimlib] / src / lzx-common.c

diff --git a/src/lzx-common.c b/src/lzx-common.c
index 827b1b29657d436d0472fae98487b6d2d7f50f5c..dac43badd9c8d50ea15c2ee877c11e50ea05e3d8 100644 (file)
--- a/src/lzx-common.c
+++ b/src/lzx-common.c
@@ -5,20 +5,18 @@
 /*
  * Copyright (C) 2012, 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * 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
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -73,12 +71,12 @@ lzx_get_window_order(size_t max_block_size)
 {
        unsigned order;
 
-       if (max_block_size == 0 || max_block_size > (1 << LZX_MAX_WINDOW_ORDER))
+       if (max_block_size == 0 || max_block_size > LZX_MAX_WINDOW_SIZE)
                return 0;
 
        order = bsr32(max_block_size);
 
-       if ((1 << order) != max_block_size)
+       if (((u32)1 << order) != max_block_size)
                order++;
 
        return max(order, LZX_MIN_WINDOW_ORDER);
@@ -89,7 +87,7 @@ lzx_get_window_order(size_t max_block_size)
 unsigned
 lzx_get_num_main_syms(unsigned window_order)
 {
-       u32 window_size = 1 << window_order;
+       u32 window_size = (u32)1 << window_order;
 
        /* NOTE: the calculation *should* be as follows:
         *