Win32: Fix drive root detection with \\?\-style paths

[wimlib] / src / lz77.c

diff --git a/src/lz77.c b/src/lz77.c
index 2926c128f0df0b9c7eb3128e4cedf8a5ade53665..2d85ae8f23609b6bb62014baed5e1dbe90eb2a55 100644 (file)
--- a/src/lz77.c
+++ b/src/lz77.c
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
  *
  * This file is part of wimlib, a library for working with WIM files.
@@ -26,7 +26,13 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "compress.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib/compress.h"
+#include "wimlib/util.h"
+
 #include <string.h>
 
 #define LZ_MIN_MATCH 3
@@ -52,7 +58,8 @@
  * The AND operation guarantees that only 3 characters will affect the hash
  * value, so every identical 3-character string will have the same hash value.
  */
-static inline uint update_hash(uint hash, u8 c)
+static inline unsigned
+update_hash(unsigned hash, u8 c)
 {
        return ((hash << HASH_SHIFT) ^ c) & HASH_MASK;
 }
@@ -70,8 +77,10 @@ static inline uint update_hash(uint hash, u8 c)
  * to walk through the hash chain, until the special index `0' is reached,
  * indicating the end of the hash chain.
  */
-static inline uint insert_string(u16 hash_tab[], u16 prev_tab[],
-                                const u8 window[], uint str_pos, uint hash)
+static inline unsigned
+insert_string(u16 hash_tab[], u16 prev_tab[],
+             const u8 window[], unsigned str_pos,
+             unsigned hash)
 {
        hash = update_hash(hash, window[str_pos + LZ_MIN_MATCH - 1]);
        prev_tab[str_pos] = hash_tab[hash];
@@ -101,21 +110,22 @@ static inline uint insert_string(u16 hash_tab[], u16 prev_tab[],
  *
  * Returns the length of the match that was found.
  */
-static uint longest_match(const u8 window[], uint bytes_remaining,
-                         uint strstart, const u16 prev_tab[],
-                         uint cur_match, uint prev_len,
-                         uint *match_start_ret,
-                         const struct lz_params *params)
+static unsigned
+longest_match(const u8 window[], unsigned bytes_remaining,
+             unsigned strstart, const u16 prev_tab[],
+             unsigned cur_match, unsigned prev_len,
+             unsigned *match_start_ret,
+             const struct lz_params *params)
 {
-       uint chain_len = params->max_chain_len;
+       unsigned chain_len = params->max_chain_len;
 
        const u8 *scan = window + strstart;
        const u8 *match;
-       uint len;
-       uint best_len = prev_len;
-       uint match_start = cur_match;
+       unsigned len;
+       unsigned best_len = prev_len;
+       unsigned match_start = cur_match;
 
-       uint nice_match = min(params->nice_match, bytes_remaining);
+       unsigned nice_match = min(params->nice_match, bytes_remaining);
 
        const u8 *strend = scan + min(params->max_match, bytes_remaining);
 
@@ -209,20 +219,25 @@ static uint longest_match(const u8 window[], uint bytes_remaining,
  * is the number of slots in @match_tab that have been filled with the
  * intermediate representation of a match or literal byte.
  */
-uint lz_analyze_block(const u8 uncompressed_data[], uint uncompressed_len,
-                     u32 match_tab[], lz_record_match_t record_match,
-                     lz_record_literal_t record_literal, void *record_match_arg1,
-                     void *record_match_arg2, void *record_literal_arg,
-                     const struct lz_params *params)
+unsigned
+lz_analyze_block(const u8 uncompressed_data[],
+                unsigned uncompressed_len,
+                u32 match_tab[],
+                lz_record_match_t record_match,
+                lz_record_literal_t record_literal,
+                void *record_match_arg1,
+                void *record_match_arg2,
+                void *record_literal_arg,
+                const struct lz_params *params)
 {
-       uint cur_match_pos = 0;
-       uint cur_input_pos = 0;
-       uint hash          = 0;
-       uint hash_head     = 0;
-       uint prev_len      = params->min_match - 1;
-       uint prev_start;
-       uint match_len     = params->min_match - 1;
-       uint match_start   = 0;
+       unsigned cur_match_pos = 0;
+       unsigned cur_input_pos = 0;
+       unsigned hash          = 0;
+       unsigned hash_head     = 0;
+       unsigned prev_len      = params->min_match - 1;
+       unsigned prev_start;
+       unsigned match_len     = params->min_match - 1;
+       unsigned match_start   = 0;
        bool match_available = false;
        u16 hash_tab[HASH_SIZE];
        u32 match;
@@ -275,7 +290,7 @@ uint lz_analyze_block(const u8 uncompressed_data[], uint uncompressed_len,
                if (prev_len >= params->min_match && match_len <= prev_len) {
 
                        /* Do not insert strings in hash table beyond this. */
-                       uint max_insert = uncompressed_len - params->min_match;
+                       unsigned max_insert = uncompressed_len - params->min_match;
 
                        /*DEBUG("Recording match (pos = %u, offset = %u, len = %u)\n",*/
                                        /*cur_input_pos - 1, */